archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.6'

Browse source
This commit is contained in:
Andrey Hristov 2014-02-17 19:04:14 +02:00
commit f3e59b838e
1 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ext/mysqlnd/mysqlnd_result.c
View file

@ -1155,24 +1155,6 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c
*/ */
} }
/* Overflow ? */ /* Overflow ? */
#if 0
if (set->row_count) {
/* don't try to allocate more than possible - mnd_XXalloc expects size_t, and it can have narrower range than uint64_t */
if (set->row_count * meta->field_count * sizeof(zval *) > SIZE_MAX) {
SET_OOM_ERROR(*conn->error_info);
ret = FAIL;
goto end;
}
/* if pecalloc is used valgrind barks gcc version 4.3.1 20080507 (prerelease) [gcc-4_3-branch revision 135036] (SUSE Linux) */
set->data = mnd_emalloc((size_t)(set->row_count * meta->field_count * sizeof(zval *)));
if (!set->data) {
SET_OOM_ERROR(*conn->error_info);
ret = FAIL;
goto end;
}
memset(set->data, 0, (size_t)(set->row_count * meta->field_count * sizeof(zval *)));
}
#endif
MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn->stats, MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn->stats,
binary_protocol? STAT_ROWS_BUFFERED_FROM_CLIENT_PS: binary_protocol? STAT_ROWS_BUFFERED_FROM_CLIENT_PS:
STAT_ROWS_BUFFERED_FROM_CLIENT_NORMAL, STAT_ROWS_BUFFERED_FROM_CLIENT_NORMAL,