From: Marcus Boerger <helly@php.net>
Date: Sat, 17 Apr 2004 14:02:40 +0000 (+0000)
Subject: Retval may not be set when zend_execute() is overloaded
X-Git-Tag: php-5.0.0RC2RC2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d58fe0357d1f153309e1883d83616a106ed5a4eb;p=php

Retval may not be set when zend_execute() is overloaded
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 2ca28c4773..8e928fb996 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1092,7 +1092,7 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
 					zval_ptr_dtor(EG(return_value_ptr_ptr));
 					local_retval = NULL;
 				}
-			} else if (!retval) {
+			} else if (!retval && *EG(return_value_ptr_ptr)) {
 				zval_ptr_dtor(EG(return_value_ptr_ptr));
 				local_retval = NULL;
 			}