archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #24007 (Problem with register_globals & arrays)

Browse source
This commit is contained in:
Ilia Alshanetsky 2003-06-14 15:08:27 +00:00
parent f07f3267e2
commit 93a5238465
2 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
main/php_variables.c
View file

@ -67,23 +67,15 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_arra
char *ip; /* index pointer */
char *index;
int var_len, index_len;
zval *gpc_element, **gpc_element_p, **top_gpc_p=NULL;
zval *gpc_element, **gpc_element_p;
zend_bool is_array;
HashTable *symtable1=NULL;
HashTable *symtable2=NULL;
assert(var != NULL);
if (track_vars_array) {
symtable1 = Z_ARRVAL_P(track_vars_array);
}
if (PG(register_globals)) {
if (symtable1) {
symtable2 = EG(active_symbol_table);
} else {
symtable1 = EG(active_symbol_table);
}
}
if (!symtable1) {
/* Nothing to do */
zval_dtor(val);
@ -168,9 +160,6 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_arra
efree(escaped_index);
}
}
if (!top_gpc_p) {
top_gpc_p = gpc_element_p;
}
symtable1 = Z_ARRVAL_PP(gpc_element_p);
/* ip pointed to the '[' character, now obtain the key */
index = index_s;
@ -193,19 +182,9 @@ plain_var:
} else {
zend_hash_update(symtable1, index, index_len+1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);
}
if (!top_gpc_p) {
top_gpc_p = gpc_element_p;
}
break;
}
}
if (top_gpc_p) {
if (symtable2) {
zend_hash_update(symtable2, var, var_len+1, top_gpc_p, sizeof(zval *), NULL);
(*top_gpc_p)->refcount++;
}
}
}