From: Andi Gutmans <andi@php.net>
Date: Sat, 8 Dec 2001 20:58:20 +0000 (+0000)
Subject: - Fix crash with unhandled exceptions
X-Git-Tag: ChangeLog~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84603723958c8338d63d90e831ace4e3281bb27b;p=php

- Fix crash with unhandled exceptions
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 1bfb53079c..85eb43d03f 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -817,7 +817,9 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
 		if (EG(active_op_array)) {
 			EG(return_value_ptr_ptr) = retval ? retval : &local_retval;
 			zend_execute(EG(active_op_array) TSRMLS_CC);
-			if (!retval) {
+			if (EG(exception)) {
+				zval_ptr_dtor(&EG(exception));
+			} else if (!retval) {
 				zval_ptr_dtor(EG(return_value_ptr_ptr));
 				local_retval = NULL;
 			}