From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 24 Feb 2014 07:31:46 +0000 (+0400)
Subject: Fixed zend_rebuild_symbol_table() using IS_INDIRECT
X-Git-Tag: POST_PHPNG_MERGE~412^2~568
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23c9d3eb01fd69af938b0b01e78f837e78993f51;p=php

Fixed zend_rebuild_symbol_table() using IS_INDIRECT
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 147461f838..26791c357b 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1724,10 +1724,10 @@ ZEND_API void zend_rebuild_symbol_table(TSRMLS_D) /* {{{ */
  			}
 			for (i = 0; i < ex->op_array->last_var; i++) {
 				if (Z_TYPE_P(EX_VAR_NUM_2(ex, i)) != IS_UNDEF) {
-					// TODO: use INDIRECT???
-					zend_hash_update(EG(active_symbol_table),
+					zval *zv = zend_hash_update(EG(active_symbol_table),
 						ex->op_array->vars[i],
 						EX_VAR_NUM_2(ex, i));
+					ZVAL_INDIRECT(EX_VAR_NUM_2(ex, i), zv);
 				}
 			}
 		}