From: Zeev Suraski <zeev@php.net>
Date: Mon, 7 May 2001 11:08:18 +0000 (+0000)
Subject: Make zend_execute_scripts() reentrant
X-Git-Tag: php-4.0.6RC1~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0eadc7e42368e4b94c896ef115336811e0ac4439;p=php

Make zend_execute_scripts() reentrant
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 61260dbe59..bbbe0ac0cb 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -734,6 +734,7 @@ ZEND_API int zend_execute_scripts(int type CLS_DC ELS_DC, int file_count, ...)
 	va_list files;
 	int i;
 	zend_file_handle *file_handle;
+	zend_op_array *orig_op_array = EG(active_op_array);
 
 	va_start(files, file_count);
 	for (i=0; i<file_count; i++) {
@@ -752,10 +753,12 @@ ZEND_API int zend_execute_scripts(int type CLS_DC ELS_DC, int file_count, ...)
 			efree(EG(active_op_array));
 		} else if (type==ZEND_REQUIRE) {
 			va_end(files);
+			EG(active_op_array) = orig_op_array;
 			return FAILURE;
 		}
 	}
 	va_end(files);
+	EG(active_op_array) = orig_op_array;
 
 	return SUCCESS;
 }