com php-src: Fixed zend_rebuild_symbol_table() usin g IS_INDIRECT: Zend/zend_execute_API.c
| From: | Dmitry Stogov | Date: | Mon, 24 Feb 2014 07:31:46 +0000 |
| Subject: | com php-src: Fixed zend_rebuild_symbol_table() usin g IS_INDIRECT: Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77968@lists.php.net to get a copy of this message | ||
Commit: 23c9d3eb01fd69af938b0b01e78f837e78993f51
Author: Dmitry Stogov <dmitry@zend.com> Mon, 24 Feb 2014 11:31:46 +0400
Parents: e43f57e2153bd0fa3a2fc866a50165ff72348451
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=23c9d3eb01fd69af938b0b01e78f837e78993f51
Log:
Fixed zend_rebuild_symbol_table() using IS_INDIRECT
Changed paths:
M Zend/zend_execute_API.c
Diff:
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 147461f..26791c3 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);
}
}
}