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

Use zval_ptr_dtor_nogc() for data that can't be circular

Browse source
This commit is contained in:
Dmitry Stogov 2017-06-29 12:14:41 +03:00
parent bbb786c85b
commit e111bccd48
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/mysqlnd/mysqlnd_result.c
View file

@ -132,7 +132,7 @@ MYSQLND_METHOD(mysqlnd_result_buffered_c, initialize_result_set_rest)(MYSQLND_RE
meta->fields[i].max_length = len; meta->fields[i].max_length = len;
} }
} }
zval_ptr_dtor(&current_row[i]); zval_ptr_dtor_nogc(&current_row[i]);
} }
} }
mnd_efree(current_row); mnd_efree(current_row);
@ -156,7 +156,7 @@ MYSQLND_METHOD(mysqlnd_result_unbuffered, free_last_data)(MYSQLND_RES_UNBUFFERED
if (unbuf->last_row_data) { if (unbuf->last_row_data) {
unsigned int i; unsigned int i;
for (i = 0; i < unbuf->field_count; i++) { for (i = 0; i < unbuf->field_count; i++) {
zval_ptr_dtor(&(unbuf->last_row_data[i])); zval_ptr_dtor_nogc(&(unbuf->last_row_data[i]));
} }
/* Free last row's zvals */ /* Free last row's zvals */
@ -225,7 +225,7 @@ MYSQLND_METHOD(mysqlnd_result_buffered_zval, free_result)(MYSQLND_RES_BUFFERED_Z
if (current_row != NULL) { if (current_row != NULL) {
for (col = field_count - 1; col >= 0; --col) { for (col = field_count - 1; col >= 0; --col) {
zval_ptr_dtor(&(current_row[col])); zval_ptr_dtor_nogc(&(current_row[col]));
} }
} }
} }
@ -1244,7 +1244,7 @@ MYSQLND_METHOD(mysqlnd_result_buffered_c, fetch_row)(MYSQLND_RES * result, void
It also simplifies the handling of Z_ADDREF_P because we don't need to check if only It also simplifies the handling of Z_ADDREF_P because we don't need to check if only
either NUM or ASSOC is set but not both. either NUM or ASSOC is set but not both.
*/ */
zval_ptr_dtor(data); zval_ptr_dtor_nogc(data);
} }
mnd_efree(current_row); mnd_efree(current_row);
++set->current_row; ++set->current_row;
@ -1822,7 +1822,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, const unsigned int
do { do {
mysqlnd_fetch_into(result, flags, &row, MYSQLND_MYSQLI); mysqlnd_fetch_into(result, flags, &row, MYSQLND_MYSQLI);
if (Z_TYPE(row) != IS_ARRAY) { if (Z_TYPE(row) != IS_ARRAY) {
zval_ptr_dtor(&row); zval_ptr_dtor_nogc(&row);
break; break;
} }
add_index_zval(return_value, i++, &row); add_index_zval(return_value, i++, &row);