Skip to content

Commit ef882c9

Browse files
committed
Fix zval_dtor on PHP 8.6+
reference: php/php-src@df8ce6d
1 parent f5b102b commit ef882c9

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

php_memcached.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,7 @@ static void php_memc_getMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
16891689
}
16901690

16911691
if (!retval || EG(exception)) {
1692-
zval_dtor(return_value);
1692+
zval_ptr_dtor_nogc(return_value);
16931693
RETURN_FROM_GET;
16941694
}
16951695
}
@@ -1892,7 +1892,7 @@ PHP_METHOD(Memcached, fetchAll)
18921892
status = php_memc_result_apply(intern, s_fetch_all_apply, 0, return_value);
18931893

18941894
if (s_memc_status_handle_result_code(intern, status) == FAILURE) {
1895-
zval_dtor(return_value);
1895+
zval_ptr_dtor_nogc(return_value);
18961896
RETURN_FALSE;
18971897
}
18981898
}
@@ -2935,7 +2935,7 @@ PHP_METHOD(Memcached, getVersion)
29352935
array_init(return_value);
29362936
status = memcached_server_cursor(intern->memc, callbacks, return_value, 1);
29372937
if (s_memc_status_handle_result_code(intern, status) == FAILURE) {
2938-
zval_dtor(return_value);
2938+
zval_ptr_dtor_nogc(return_value);
29392939
RETURN_FALSE;
29402940
}
29412941
}
@@ -2977,7 +2977,7 @@ PHP_METHOD(Memcached, getAllKeys)
29772977
*/
29782978
if (rc != MEMCACHED_CLIENT_ERROR && rc != MEMCACHED_SERVER_ERROR
29792979
&& s_memc_status_handle_result_code(intern, rc) == FAILURE) {
2980-
zval_dtor(return_value);
2980+
zval_ptr_dtor_nogc(return_value);
29812981
RETURN_FALSE;
29822982
}
29832983
}

0 commit comments

Comments
 (0)