summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2014-02-24 16:37:43 +0800
committerXinchen Hui <laruence@gmail.com>2014-02-24 16:37:43 +0800
commit0b37b90ec40eeaa6963130e864eba02bea9d39ce (patch)
tree231f6663f4c43d8b332a4f55f01048e47f2addc3 /Zend/zend_execute_API.c
parent1bb59c73c4b89c0fd91eca28faeae4fb1d5287fe (diff)
parent448e28cc8445826d356dc8cef526a103bd798a9a (diff)
downloadphp-git-0b37b90ec40eeaa6963130e864eba02bea9d39ce.tar.gz
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c4
1 files changed, 2 insertions, 2 deletions
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);
}
}
}