From 64806e499e64db45cf82b4014b4b5d6fef10e021 Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Thu, 5 Oct 2006 23:24:55 +0000 Subject: [PATCH] Preserve EG(return_value_ptr_ptr) when calling zend_execute_scripts() --- Zend/zend.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Zend/zend.c b/Zend/zend.c index ccb129407d..b260500e14 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1596,6 +1596,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); @@ -1659,11 +1660,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; } -- 2.50.1