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'

Browse Source 
* PHP-8.3:
  Restore error handler after running it
This commit is contained in:
Ilija Tovilo
2024-03-20 10:53:35 +01:00
parent 6fb20cd9de 3301d9602a
commit bc59e79d21
5 changed files with 90 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Zend/tests/gh13446_1.phpt Normal file
View File

@@ -0,0 +1,19 @@
--TEST--
GH-13446: Exception handler is restored after is has finished
--FILE--
<?php
function exception_handler($ex) {
echo 'Exception caught: ', $ex->getMessage(), "\n";
}
set_exception_handler('exception_handler');
register_shutdown_function(function () {
echo set_exception_handler(null), "\n";
restore_exception_handler();
});
throw new Exception('Test');
?>
--EXPECT--
Exception caught: Test
exception_handler

16
Zend/tests/gh13446_2.phpt Normal file
View File

@@ -0,0 +1,16 @@
--TEST--
GH-13446: Exception handler attempting to free itself
--FILE--
<?php
$x = new \stdClass();
$handler = function ($ex) use (&$handler, $x) {
$handler = null;
var_dump($x);
};
unset($x);
set_exception_handler($handler);
throw new Exception('Unhandled');
?>
--EXPECT--
object(stdClass)#1 (0) {
}

25
Zend/tests/gh13446_3.phpt Normal file
View File

@@ -0,0 +1,25 @@
--TEST--
GH-13446: Exception handler isn't restored if it is previously modified
--FILE--
<?php
function exception_handler_1($ex) {
echo "Handler 1\n";
set_exception_handler('exception_handler_2');
}
function exception_handler_2($ex) {
echo "Handler 2\n";
}
set_exception_handler('exception_handler_1');
register_shutdown_function(function () {
echo set_exception_handler(null), "\n";
restore_exception_handler();
});
throw new Exception();
?>
--EXPECT--
Handler 1
exception_handler_2

21
Zend/tests/gh13446_4.phpt Normal file
View File

@@ -0,0 +1,21 @@
--TEST--
GH-13446: Exception handler isn't restored if stack is empty
--FILE--
<?php
function exception_handler() {
echo "Handler\n";
restore_exception_handler();
restore_exception_handler();
}
set_exception_handler('exception_handler');
register_shutdown_function(function () {
var_dump(set_exception_handler(null));
restore_exception_handler();
});
throw new Exception();
?>
--EXPECT--
Handler
NULL

10
Zend/zend.c
View File

@@ -1859,7 +1859,9 @@ ZEND_API ZEND_COLD void zend_user_exception_handler(void) /* {{{ */
old_exception = EG(exception);
EG(exception) = NULL;
ZVAL_OBJ(&params[0], old_exception);
ZVAL_COPY_VALUE(&orig_user_exception_handler, &EG(user_exception_handler));
zend_stack_push(&EG(user_exception_handlers), &orig_user_exception_handler);
ZVAL_UNDEF(&EG(user_exception_handler));
if (call_user_function(CG(function_table), NULL, &orig_user_exception_handler, &retval2, 1, params) == SUCCESS) {
@@ -1873,7 +1875,13 @@ ZEND_API ZEND_COLD void zend_user_exception_handler(void) /* {{{ */
EG(exception) = old_exception;
}
zval_ptr_dtor(&orig_user_exception_handler);
if (Z_TYPE(EG(user_exception_handler)) == IS_UNDEF) {
zval *tmp = zend_stack_top(&EG(user_exception_handlers));
if (tmp) {
ZVAL_COPY_VALUE(&EG(user_exception_handler), tmp);
zend_stack_del_top(&EG(user_exception_handlers));
}
}
} /* }}} */
ZEND_API zend_result zend_execute_script(int type, zval *retval, zend_file_handle *file_handle)