diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-06-29 12:14:41 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-06-29 12:14:41 +0300 |
| commit | e111bccd48377798aee38fa94fc22cd374b3980b (patch) | |
| tree | 56d40d7fc77e2daf6522c49b59ad9cc5aee0ce0d | |
| parent | bbb786c85ba93994ec0ac3025f0f84caea317483 (diff) | |
| download | php-git-e111bccd48377798aee38fa94fc22cd374b3980b.tar.gz | |
Use zval_ptr_dtor_nogc() for data that can't be circular
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index a86b4ed01a..22d70f52bb 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -132,7 +132,7 @@ MYSQLND_METHOD(mysqlnd_result_buffered_c, initialize_result_set_rest)(MYSQLND_RE meta->fields[i].max_length = len; } } - zval_ptr_dtor(¤t_row[i]); + zval_ptr_dtor_nogc(¤t_row[i]); } } mnd_efree(current_row); @@ -156,7 +156,7 @@ MYSQLND_METHOD(mysqlnd_result_unbuffered, free_last_data)(MYSQLND_RES_UNBUFFERED if (unbuf->last_row_data) { unsigned int 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 */ @@ -225,7 +225,7 @@ MYSQLND_METHOD(mysqlnd_result_buffered_zval, free_result)(MYSQLND_RES_BUFFERED_Z if (current_row != NULL) { 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 either NUM or ASSOC is set but not both. */ - zval_ptr_dtor(data); + zval_ptr_dtor_nogc(data); } mnd_efree(current_row); ++set->current_row; @@ -1822,7 +1822,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, const unsigned int do { mysqlnd_fetch_into(result, flags, &row, MYSQLND_MYSQLI); if (Z_TYPE(row) != IS_ARRAY) { - zval_ptr_dtor(&row); + zval_ptr_dtor_nogc(&row); break; } add_index_zval(return_value, i++, &row); |