com php-src: Ensure proper set_exception_handler() ha ndling with exit() inside it: sapi/phpdbg/phpdb g_prompt.c

Commit: 4f90e2ec9d1d93652cef813789fa3aa3545e007f Author: Bob Weinand <bobwei9@hotmail.com> Fri, 2 Oct 2015 12:37:17 +0200 Parents: 0c03ba0ad0dfb4c5a7d3a1de19545a785be90ed6 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4f90e2ec9d1d93652cef813789fa3aa3545e007f Log: Ensure proper set_exception_handler() handling with exit() inside it Changed paths: M sapi/phpdbg/phpdbg_prompt.c Diff: diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index c16836c..50971b2 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -748,12 +748,20 @@ PHPDBG_COMMAND(run) /* {{{ */ if (restore) { zend_exception_restore(); - zend_try_exception_handler(); + zend_try { + zend_try_exception_handler(); + PHPDBG_G(in_execution) = 1; + } zend_catch { + PHPDBG_G(in_execution) = 0; + + if (PHPDBG_G(flags) & PHPDBG_IS_STOPPING) { + zend_bailout(); + } + } zend_end_try(); + if (EG(exception)) { phpdbg_handle_exception(); } - - PHPDBG_G(in_execution) = 1; } PHPDBG_G(flags) &= ~PHPDBG_IS_RUNNING;