summaryrefslogtreecommitdiff
path: root/main/php_variables.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-07-04 18:03:45 +0400
committerDmitry Stogov <dmitry@zend.com>2014-07-04 18:03:45 +0400
commit6bf24f4dd01331122a0f10db392c08605f159826 (patch)
tree7fe575ead375355aab6c9b2c8a1593642d658406 /main/php_variables.c
parentd2890963e4540a20954afae0e059810312c9dc4e (diff)
downloadphp-git-6bf24f4dd01331122a0f10db392c08605f159826.tar.gz
Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data)
Diffstat (limited to 'main/php_variables.c')
-rw-r--r--main/php_variables.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/main/php_variables.c b/main/php_variables.c
index 30a84822af..8fa48b2889 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -110,8 +110,7 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars
}
/* GLOBALS hijack attempt, reject parameter */
- if (symtable1 && EG(active_symbol_table) &&
- symtable1 == &EG(active_symbol_table)->ht &&
+ if (symtable1 == &EG(symbol_table).ht &&
var_len == sizeof("GLOBALS")-1 &&
!memcmp(var, "GLOBALS", sizeof("GLOBALS")-1)) {
zval_dtor(val);