]> granicus.if.org Git - php/commitdiff
Fixed phar test segfault after merged engine exception
authorXinchen Hui <laruence@php.net>
Tue, 10 Mar 2015 07:04:01 +0000 (15:04 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 10 Mar 2015 07:04:01 +0000 (15:04 +0800)
main/main.c

index 14f86b0ad17dac55642ee97ddc9364f56686a148..b0400463f035d6c0f0b2a509428311ef5ac1fdf1 100644 (file)
@@ -2522,7 +2522,9 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file)
        } zend_end_try();
 
        if (EG(exception)) {
-               zend_exception_error(EG(exception), E_ERROR);
+               zend_try {
+                       zend_exception_error(EG(exception), E_ERROR);
+               } zend_end_try();
        }
 
 #if HAVE_BROKEN_GETCWD