mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'PHP-8.4'
* PHP-8.4: Fix GH-16181: phpdbg: exit in exception handler reports fatal error
This commit is contained in:
commit
2f09c0ed0f
2 changed files with 27 additions and 1 deletions
|
@ -904,7 +904,7 @@ free_cmd:
|
||||||
}
|
}
|
||||||
} zend_end_try();
|
} zend_end_try();
|
||||||
|
|
||||||
if (EG(exception)) {
|
if (EG(exception) && !zend_is_unwind_exit(EG(exception))) {
|
||||||
phpdbg_handle_exception();
|
phpdbg_handle_exception();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
26
sapi/phpdbg/tests/gh16181.phpt
Normal file
26
sapi/phpdbg/tests/gh16181.phpt
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
--TEST--
|
||||||
|
GH-16181 (phpdbg: exit in exception handler reports fatal error)
|
||||||
|
--PHPDBG--
|
||||||
|
r
|
||||||
|
c
|
||||||
|
q
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
set_exception_handler(function() {
|
||||||
|
echo "exception caught\n";
|
||||||
|
die;
|
||||||
|
});
|
||||||
|
|
||||||
|
echo "throwing exception\n";
|
||||||
|
throw new \Exception("oh noes");
|
||||||
|
?>
|
||||||
|
--EXPECTF--
|
||||||
|
[Successful compilation of %s]
|
||||||
|
prompt> throwing exception
|
||||||
|
[Uncaught Exception in %s on line %d: oh noes]
|
||||||
|
>00008: throw new \Exception("oh noes");
|
||||||
|
00009: ?>
|
||||||
|
00010:
|
||||||
|
prompt> exception caught
|
||||||
|
[Script ended normally]
|
||||||
|
prompt>
|
Loading…
Add table
Add a link
Reference in a new issue