diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-11-21 09:50:14 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-11-21 09:50:14 +0100 |
| commit | 0d7d3241164b4769b93867da2e8adb724ae17950 (patch) | |
| tree | 18848ffcc5f7d70c56cd890352f518b60af11ea1 /ext/mysqli | |
| parent | 3f2474550cbf299d8a7df34988ece052a0401414 (diff) | |
| download | php-0d7d3241164b4769b93867da2e8adb724ae17950.tar.gz | |
New upstream version 5.5.6+dfsgupstream/5.5.6+dfsg
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 2 | ||||
| -rw-r--r-- | ext/mysqli/tests/bug66043.phpt | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 3ee5c803a..e67aba8da 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -385,7 +385,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval ***args, unsigned int argc, /* Changed to my_bool in MySQL 5.1. See MySQL Bug #16144 */ my_bool tmp; #else - uint tmp = 0; + ulong tmp = 0; #endif stmt->result.buf[ofs].type = IS_STRING; /* diff --git a/ext/mysqli/tests/bug66043.phpt b/ext/mysqli/tests/bug66043.phpt new file mode 100644 index 000000000..d0e8b1c3d --- /dev/null +++ b/ext/mysqli/tests/bug66043.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #66043 (Segfault calling bind_param() on mysqli) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once("connect.inc"); +if ($IS_MYSQLND) { + die("skip libmysql only test"); +} +require_once('skipifconnectfailure.inc'); +?> +--FILE-- +<?php +require 'connect.inc'; +$db = new mysqli($host, $user, $passwd, 'mysql'); + +$stmt = $db->stmt_init(); +$stmt->prepare("SELECT User FROM user WHERE password=\"\""); +$stmt->execute(); +$stmt->bind_result($testArg); +echo "Okey"; +?> +--EXPECTF-- +Okey |