com php-src: Fixed bug #74021: NEWS ext/mysqli/tests/bug73800.phpt ext/mysqli/tests/bug74021.phpt ext/mysqlnd/mysqlnd_wireprotoc ol.c

Commit: 01c1afa79f614fe8376e73f4e73f392160923745 Author: andrewnester <andrew.nester.dev@gmail.com> Wed, 1 Feb 2017 13:43:55 +0300 Committer: Nikita Popov <nikita.ppv@gmail.com> Sun, 12 Feb 2017 12:48:18 +0100 Parents: ee25eb0eae52a942c914b997c14d9558be76ee88 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=01c1afa79f614fe8376e73f4e73f392160923745 Log: Fixed bug #74021 Bugs: https://bugs.php.net/74021 Changed paths: M NEWS A ext/mysqli/tests/bug73800.phpt A ext/mysqli/tests/bug74021.phpt M ext/mysqlnd/mysqlnd_wireprotocol.c Diff: diff --git a/NEWS b/NEWS index 72c0b09..78277ac 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,10 @@ PHP NEWS . Fixed bug #74031 (ReflectionFunction for imagepng is missing last two parameters). (finwe) +- Mysqlnd: + . Fixed bug #74021 (fetch_array broken data. Data more then MEDIUMBLOB). + (Andrew Nester, Nikita) + - Opcache: . Fixed bug #74019 (Segfault with list). (Laruence) diff --git a/ext/mysqli/tests/bug73800.phpt b/ext/mysqli/tests/bug73800.phpt new file mode 100644 index 0000000..af601c6 --- /dev/null +++ b/ext/mysqli/tests/bug73800.phpt @@ -0,0 +1,27 @@ +--TEST-- +Bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +if (PHP_INT_SIZE != 8) die('skip requires 64-bit'); +?> +--FILE-- +<?php + +require_once("connect.inc"); +$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); + +$link->query('SET @@global.max_allowed_packet = 67108864'); +$link->close(); + +$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); +$link->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, 1); + +$res = $link->query("SELECT RPAD('1',9000000,'1') as a,RPAD('1',9000000,'1') as b, 9223372036854775807 as c"); +$r = $res->fetch_array(); + +var_dump($r['c']); +?> +--EXPECT-- +int(9223372036854775807) diff --git a/ext/mysqli/tests/bug74021.phpt b/ext/mysqli/tests/bug74021.phpt new file mode 100644 index 0000000..a6d83fe --- /dev/null +++ b/ext/mysqli/tests/bug74021.phpt @@ -0,0 +1,25 @@ +--TEST-- +Bug #74021 (fetch_array broken data. Data more then MEDIUMBLOB) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> +--FILE-- +<?php + +require_once("connect.inc"); +$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); + +$link->query('SET @@global.max_allowed_packet = 67108864'); +$link->close(); + +$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); +$res = $link->query("SELECT RPAD('1',9000000,'1') as a,RPAD('1',9000000,'1') as b"); +$r = $res->fetch_array(); +var_dump(md5($r['a'])); +var_dump(md5($r['b'])); +?> +--EXPECT-- +string(32) "42ca0fd16ab6b6d4b9d47dc0a4a8b12a" +string(32) "42ca0fd16ab6b6d4b9d47dc0a4a8b12a" diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 2620f3b..6113543 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -1458,7 +1458,7 @@ php_mysqlnd_read_row_ex(MYSQLND_CONN_DATA * conn, MYSQLND_MEMORY_POOL * result_s zero-length byte, don't read the body, there is no such. */ - *data_size = prealloc_more_bytes; + *data_size = 0; while (1) { if (FAIL == mysqlnd_read_header(conn->net, &header, conn->stats, conn->error_info)) { ret = FAIL; @@ -1469,7 +1469,8 @@ php_mysqlnd_read_row_ex(MYSQLND_CONN_DATA * conn, MYSQLND_MEMORY_POOL * result_s if (first_iteration) { first_iteration = FALSE; - *buffer = result_set_memory_pool->get_chunk(result_set_memory_pool, *data_size); + *buffer = result_set_memory_pool->get_chunk( + result_set_memory_pool, *data_size + prealloc_more_bytes); if (!*buffer) { ret = FAIL; break; @@ -1484,7 +1485,7 @@ php_mysqlnd_read_row_ex(MYSQLND_CONN_DATA * conn, MYSQLND_MEMORY_POOL * result_s /* We have to realloc the buffer. */ - if (FAIL == (*buffer)->resize_chunk((*buffer), *data_size)) { + if (FAIL == (*buffer)->resize_chunk((*buffer), *data_size + prealloc_more_bytes)) { SET_OOM_ERROR(*conn->error_info); ret = FAIL; break; @@ -1507,7 +1508,6 @@ php_mysqlnd_read_row_ex(MYSQLND_CONN_DATA * conn, MYSQLND_MEMORY_POOL * result_s (*buffer)->free_chunk((*buffer)); *buffer = NULL; } - *data_size -= prealloc_more_bytes; DBG_RETURN(ret); } /* }}} */