Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data)

This commit is contained in:
Dmitry Stogov 2014-07-04 18:03:45 +04:00
parent d2890963e4
commit 6bf24f4dd0
21 changed files with 251 additions and 199 deletions

View file

@ -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);