php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 13:31:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE

Browse Source 
Fixes bug #73800

news entry for PR #2249
This commit is contained in:
vanviegen
2016-12-21 16:18:14 +01:00
committed by Joe Watkins
parent 156781baf5
commit abba56f605
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -31,6 +31,8 @@ PHP NEWS
- Mysqlnd:
. Optimized handling of BIT fields - less memory copies and lower memory
usage. (Andrey)
. Fixed bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE).
(vanviegen)
- Opcache:
. Fixed bug #73789 (Strange behavior of class constants in switch/case block).

8
ext/mysqlnd/mysqlnd_wireprotocol.c
View File

@@ -1477,7 +1477,12 @@ php_mysqlnd_read_row_ex(MYSQLND_PFC * pfc,
zero-length byte, don't read the body, there is no such.
*/
*data_size = 0;
/*
We're allocating an extra byte, as php_mysqlnd_rowp_read_text_protocol_aux
needs to be able to append a terminating \0 for atoi/atof.
*/
*data_size = 1;
while (1) {
if (FAIL == mysqlnd_read_header(pfc, vio, &header, stats, error_info)) {
ret = FAIL;
@@ -1526,6 +1531,7 @@ php_mysqlnd_read_row_ex(MYSQLND_PFC * pfc,
pool->free_chunk(pool, *buffer);
*buffer = NULL;
}
*data_size--;
DBG_RETURN(ret);
}
/* }}} */