From 683251eba3cb971eaeeca3ed24e8f55bcff4533b Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Sat, 7 Dec 2002 16:05:27 +0000 Subject: Fixed bug #20796. $_GET/$_POST/$_COOKIE data can get overwritten when register_globals are on and input contains arrays. --- main/php_variables.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index 73e19a856a..fbf762ee3e 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -70,15 +70,15 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_arra assert(var != NULL); - if (PG(register_globals)) { - symtable1 = EG(active_symbol_table); - } if (track_vars_array) { + symtable1 = Z_ARRVAL_P(track_vars_array); + } + if (PG(register_globals)) { if (symtable1) { - symtable2 = Z_ARRVAL_P(track_vars_array); + symtable2 = EG(active_symbol_table); } else { - symtable1 = Z_ARRVAL_P(track_vars_array); - } + symtable1 = EG(active_symbol_table); + } } if (!symtable1) { /* Nothing to do */ -- cgit v1.2.1