php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix segfault in zend_test_execute_internal()
This commit is contained in:
Ilija Tovilo
2024-10-14 14:03:09 +02:00
parent 5f2f1a5702 0237361679
commit 7d99355dad
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/zend_test/observer.c
View File

@@ -288,7 +288,7 @@ static void zend_test_execute_internal(zend_execute_data *execute_data, zval *re
} else {
php_printf("%*s<!-- internal enter %s() -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->common.function_name));
}
} else {
} else if (ZEND_USER_CODE(fbc->type)) {
php_printf("%*s<!-- internal enter '%s' -->\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->op_array.filename));
}

16
ext/zend_test/tests/gh16294.phpt Normal file
View File

@@ -0,0 +1,16 @@
--TEST--
GH-16294: Segfault in test observer on zend_pass_function
--EXTENSIONS--
zend_test
--INI--
zend_test.observer.execute_internal=1
--FILE--
<?php
class Foo {};
new Foo([]);
?>
===DONE===
--EXPECT--
===DONE===