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

Skip dummy frames allocated on CPU stack of zend_call_function().

Browse Source 
(Usage of "current_observed_frame" varible looks unsafe to me).
This commit is contained in:
Dmitry Stogov
2021-01-26 18:41:26 +03:00
parent a2dcd44272
commit 094e1a8b2d
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Zend/zend_observer.c
View File

@@ -220,7 +220,11 @@ ZEND_API void ZEND_FASTCALL zend_observer_fcall_end(
first_observed_frame = NULL;
current_observed_frame = NULL;
} else {
current_observed_frame = execute_data->prev_execute_data;
zend_execute_data *ex = execute_data->prev_execute_data;
while (ex && !ex->func) {
ex = ex->prev_execute_data;
}
current_observed_frame = ex;
}
}
@@ -228,7 +232,7 @@ ZEND_API void zend_observer_fcall_end_all(void)
{
zend_execute_data *ex = current_observed_frame;
while (ex != NULL) {
if (ex->func->type != ZEND_INTERNAL_FUNCTION) {
if (ex->func && ex->func->type != ZEND_INTERNAL_FUNCTION) {
zend_observer_fcall_end(ex, NULL);
}
ex = ex->prev_execute_data;

35
ext/zend_test/tests/observer_error_05.phpt Normal file
View File

@@ -0,0 +1,35 @@
--TEST--
Observer: End handlers fire after a userland fatal error
--SKIPIF--
<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
--INI--
zend_test.observer.enabled=1
zend_test.observer.observe_all=1
zend_test.observer.show_return_value=1
--FILE--
<?php
set_error_handler(function ($errno, $errstr, $errfile, $errline) {
trigger_error('Foo error', E_USER_ERROR);
});
function foo()
{
return $x; // warning
}
foo();
echo 'You should not see this.';
?>
--EXPECTF--
<!-- init '%s%eobserver_error_%d.php' -->
<file '%s%eobserver_error_%d.php'>
<!-- init foo() -->
<foo>
<!-- init {closure}() -->
<{closure}>
Fatal error: Foo error in %s on line %d
</{closure}:NULL>
</foo:NULL>
</file '%s%eobserver_error_%d.php'>