diff options
| author | Xinchen Hui <laruence@php.net> | 2015-03-10 15:04:01 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-03-10 15:04:01 +0800 |
| commit | 56eed39e043715e0c81c8f515586605f14917dc0 (patch) | |
| tree | 957733ea40a43bc4195500225c0fee5521c5f1ba | |
| parent | d25acb5fd08a774feb5831c4cad308cb19357924 (diff) | |
| download | php-git-56eed39e043715e0c81c8f515586605f14917dc0.tar.gz | |
Fixed phar test segfault after merged engine exception
| -rw-r--r-- | main/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c index 14f86b0ad1..b0400463f0 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 |