From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 29 Apr 2008 09:18:54 +0000 (+0000)
Subject: Added missing lazy initialization
X-Git-Tag: RELEASE_2_0_0b1~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20abb52b1e0e8fbbd4b0e1892480c2b8462d115d;p=php

Added missing lazy initialization
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index b3a329b05f..ca4cc2b298 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1456,6 +1456,9 @@ ZEND_API int zend_u_eval_string(zend_uchar type, zstr string, zval *retval_ptr,
 		EG(return_value_ptr_ptr) = &local_retval_ptr;
 		EG(active_op_array) = new_op_array;
 		EG(no_extensions)=1;
+		if (!EG(active_symbol_table)) {
+			zend_rebuild_symbol_table(TSRMLS_C);
+		}
 
 		zend_execute(new_op_array TSRMLS_CC);
 
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index 75bbe6284a..8212f5f84f 100755
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -238,6 +238,9 @@ int spl_autoload(const zstr class_name, const zstr lc_name, int class_name_len,
 		if (new_op_array) {
 			EG(return_value_ptr_ptr) = &result;
 			EG(active_op_array) = new_op_array;
+			if (!EG(active_symbol_table)) {
+				zend_rebuild_symbol_table(TSRMLS_C);
+			}
 
 			zend_execute(new_op_array TSRMLS_CC);