From: Sara Golemon <pollita@php.net>
Date: Thu, 5 Oct 2006 23:32:52 +0000 (+0000)
Subject: MFH(r-1.376): Preserve EG(return_value_ptr_ptr) when calling zend_execute_scripts()
X-Git-Tag: php-5.2.0RC6~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67fac322af112e7e85c11bea60575814a708d193;p=php

MFH(r-1.376): Preserve EG(return_value_ptr_ptr) when calling zend_execute_scripts()
---

diff --git a/Zend/zend.c b/Zend/zend.c
index fbef8186c7..e23005b739 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1077,6 +1077,7 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
 	int i;
 	zend_file_handle *file_handle;
 	zend_op_array *orig_op_array = EG(active_op_array);
+	zval **orig_retval_ptr_ptr = EG(return_value_ptr_ptr);
 	zval *local_retval=NULL;
 
 	va_start(files, file_count);
@@ -1139,11 +1140,13 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
 		} else if (type==ZEND_REQUIRE) {
 			va_end(files);
 			EG(active_op_array) = orig_op_array;
+			EG(return_value_ptr_ptr) = orig_retval_ptr_ptr;
 			return FAILURE;
 		}
 	}
 	va_end(files);
 	EG(active_op_array) = orig_op_array;
+	EG(return_value_ptr_ptr) = orig_retval_ptr_ptr;
 
 	return SUCCESS;
 }