com php-src: Fixed phar test segfault after merged engine exception: main/main.c
| From: | Xinchen Hui | Date: | Tue, 10 Mar 2015 07:04:01 +0000 |
| Subject: | com php-src: Fixed phar test segfault after merged engine exception: main/main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85424@lists.php.net to get a copy of this message | ||
Commit: 56eed39e043715e0c81c8f515586605f14917dc0
Author: Xinchen Hui <laruence@php.net> Tue, 10 Mar 2015 15:04:01 +0800
Parents: d25acb5fd08a774feb5831c4cad308cb19357924
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56eed39e043715e0c81c8f515586605f14917dc0
Log:
Fixed phar test segfault after merged engine exception
Changed paths:
M main/main.c
Diff:
diff --git a/main/main.c b/main/main.c
index 14f86b0..b040046 100644
--- a/main/main.c
+++ b/main/main.c
@@ -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