From: Stanislav Malyshev <stas@php.net>
Date: Fri, 30 May 2003 10:05:29 +0000 (+0000)
Subject: fix crash on exceptions when return value of the inside function is used
X-Git-Tag: RELEASE_1_0_2~524
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95a3fd7b3c91d64d62ed62a2595c97cbf540e201;p=php

fix crash on exceptions when return value of the inside function is used
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 27a660577f..3aee58f3dc 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2704,7 +2704,7 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
 	zend_ptr_stack_clear_multiple(TSRMLS_C);
 
 	if (EG(exception)) {
-		if (return_value_used) {
+		if (return_value_used && EX_T(EX(opline)->result.u.var).var.ptr) {
 			zval_ptr_dtor(&EX_T(EX(opline)->result.u.var).var.ptr);
 		}
 		if (EX(opline)->op2.u.opline_num == -1) {