From: Xinchen Hui <laruence@php.net>
Date: Tue, 10 Mar 2015 07:04:01 +0000 (+0800)
Subject: Fixed phar test segfault after merged engine exception
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~722^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56eed39e043715e0c81c8f515586605f14917dc0;p=php

Fixed phar test segfault after merged engine exception
---

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