com php-src: Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors): ext/mysqli/tests/bug70949.phpt ext/mysqlnd/mysq lnd_ps.c

From: Date: Fri, 27 Nov 2015 10:04:06 +0000
Subject: com php-src: Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors): ext/mysqli/tests/bug70949.phpt ext/mysqlnd/mysq lnd_ps.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90061@lists.php.net to get a copy of this message
Commit: 1561fbad67d02b4bd5148e231245bea4c3fb4031 Author: Xinchen Hui <laruence@gmail.com> Fri, 27 Nov 2015 15:52:55 +0800 Committer: Anatol Belski <ab@php.net> Fri, 27 Nov 2015 11:04:06 +0100 Parents: 59d15ce9d472e0bc7dfb3c7b22baaa0275575e4e Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1561fbad67d02b4bd5148e231245bea4c3fb4031 Log: Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors) Bugs: https://bugs.php.net/70949 Changed paths: A ext/mysqli/tests/bug70949.phpt M ext/mysqlnd/mysqlnd_ps.c Diff: diff --git a/ext/mysqli/tests/bug70949.phpt b/ext/mysqli/tests/bug70949.phpt new file mode 100644 index 0000000..17f7f9d --- /dev/null +++ b/ext/mysqli/tests/bug70949.phpt @@ -0,0 +1,62 @@ +--TEST-- +Bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +require_once("connect.inc"); +if (!$IS_MYSQLND) { + die("skip mysqlnd only test"); +} +?> +--FILE-- +<?php +require_once("connect.inc"); +$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); + +$mysql->query("DROP TABLE IF EXISTS bug70949"); +$mysql->query("CREATE TABLE bug70949(name varchar(255))"); +$mysql->query("INSERT INTO bug70949 VALUES ('dummy'),(NULL),('foo'),('bar')"); + +$sql = "select * from bug70949"; + +if ($stmt = $mysql->prepare($sql)) +{ + $stmt->attr_set(MYSQLI_STMT_ATTR_CURSOR_TYPE, MYSQLI_CURSOR_TYPE_READ_ONLY); + + if ($stmt->bind_result($name)) { + { + if ($stmt->execute()) + { + while ($stmt->fetch()) + { + var_dump($name); + } + } + } + + $stmt->free_result(); + $stmt->close(); + } + + + $mysql->close(); +} + +?> +--CLEAN-- +<?php +require_once("connect..inc"); +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS bug70949")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> +--EXPECT-- +string(5) "dummy" +NULL +string(3) "foo" +string(3) "bar" diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 767ba34..4ffea76 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -1115,6 +1115,8 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, void * param, unsigned int f ZVAL_COPY_VALUE(result, data); /* copied data, thus also the ownership. Thus null data */ ZVAL_NULL(data); + } else { + ZVAL_NULL(result); } } }

« previous php.cvs (#90061) next »