php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1'

Browse Source 
* PHP-8.1:
  Fix long-term shutdown/tick fci/fcc storage
This commit is contained in:
Nikita Popov
2021-10-11 12:19:50 +02:00
parent 40832f20f0 fabcc9a350
commit 35adc4f7f6
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Zend/tests/register_shutdown_function_refcount.phpt Normal file
View File

@@ -0,0 +1,17 @@
--TEST--
register_shutdown_function() and long-term fci storage
--FILE--
<?php
class Test {
function register() {
register_shutdown_function('Test::method');
}
function method() {
var_dump($this);
}
}
(new Test)->register();
?>
--EXPECT--
object(Test)#1 (0) {
}

24
ext/standard/basic_functions.c
View File

@@ -1665,20 +1665,36 @@ PHP_FUNCTION(forward_static_call_array)
}
/* }}} */
static void fci_addref(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache)
{
Z_TRY_ADDREF(fci->function_name);
if (fci_cache->object) {
GC_ADDREF(fci_cache->object);
}
}
static void fci_release(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache)
{
zval_ptr_dtor(&fci->function_name);
if (fci_cache->object) {
zend_object_release(fci_cache->object);
}
}
void user_shutdown_function_dtor(zval *zv) /* {{{ */
{
php_shutdown_function_entry *shutdown_function_entry = Z_PTR_P(zv);
zval_ptr_dtor(&shutdown_function_entry->fci.function_name);
zend_fcall_info_args_clear(&shutdown_function_entry->fci, true);
fci_release(&shutdown_function_entry->fci, &shutdown_function_entry->fci_cache);
efree(shutdown_function_entry);
}
/* }}} */
void user_tick_function_dtor(user_tick_function_entry *tick_function_entry) /* {{{ */
{
zval_ptr_dtor(&tick_function_entry->fci.function_name);
zend_fcall_info_args_clear(&tick_function_entry->fci, true);
fci_release(&tick_function_entry->fci, &tick_function_entry->fci_cache);
}
/* }}} */
@@ -1784,7 +1800,7 @@ PHP_FUNCTION(register_shutdown_function)
RETURN_THROWS();
}
Z_TRY_ADDREF(entry.fci.function_name);
fci_addref(&entry.fci, &entry.fci_cache);
zend_fcall_info_argp(&entry.fci, param_count, params);
status = append_user_shutdown_function(&entry);
@@ -2353,7 +2369,7 @@ PHP_FUNCTION(register_tick_function)
}
tick_fe.calling = false;
Z_TRY_ADDREF(tick_fe.fci.function_name);
fci_addref(&tick_fe.fci, &tick_fe.fci_cache);
zend_fcall_info_argp(&tick_fe.fci, param_count, params);
if (!BG(user_tick_functions)) {