Skip to content

Commit 5f83904

Browse files
committed
Use zval_ptr_dtor_nogc() instead of zval_dtor() inplaces where circular-references are not possible
1 parent 918a9f0 commit 5f83904

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

ext/curl/multi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ static int _php_server_push_callback(CURL *parent_ch, CURL *easy, size_t num_hea
510510

511511
error = zend_call_function(&fci, &t->fci_cache);
512512
zend_fcall_info_args_clear(&fci, 1);
513-
zval_dtor(&headers);
513+
zval_ptr_dtor_nogc(&headers);
514514

515515
if (error == FAILURE) {
516516
php_error_docref(NULL, E_WARNING, "Cannot call the CURLMOPT_PUSHFUNCTION");

ext/interbase/ibase_query.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,7 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type)
16281628
}
16291629
break;
16301630
_php_ibase_fetch_error:
1631-
zval_dtor(&result);
1631+
zval_ptr_dtor_nogc(&result);
16321632
RETURN_FALSE;
16331633
} /* switch */
16341634

ext/interbase/php_ibase_udf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static void call_php(char *name, PARAMDSC *r, int argc, PARAMDSC **argv)
298298
case dtype_sql_date:
299299
case dtype_sql_time:
300300
case dtype_timestamp:
301-
zval_dtor(&args[i]);
301+
zval_ptr_dtor_nogc(&args[i]);
302302
}
303303
}
304304

ext/mysqlnd/mysqlnd_result.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_field_data)(MYSQLND_RES * result, unsigned int
18111811
*/
18121812
mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, &row, MYSQLND_MYSQL);
18131813
if (Z_TYPE(row) != IS_ARRAY) {
1814-
zval_dtor(&row);
1814+
zval_ptr_dtor_nogc(&row);
18151815
RETVAL_NULL();
18161816
DBG_VOID_RETURN;
18171817
}
@@ -1824,7 +1824,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_field_data)(MYSQLND_RES * result, unsigned int
18241824
entry = zend_hash_get_current_data(Z_ARRVAL(row));
18251825

18261826
ZVAL_COPY(return_value, entry);
1827-
zval_dtor(&row);
1827+
zval_ptr_dtor_nogc(&row);
18281828

18291829
DBG_VOID_RETURN;
18301830
}

0 commit comments

Comments
 (0)