summaryrefslogtreecommitdiff
path: root/main/php_variables.c
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2005-09-28 22:31:29 +0000
committerIlia Alshanetsky <iliaa@php.net>2005-09-28 22:31:29 +0000
commit146517684d448fa693cee70c941fa93ee0844179 (patch)
tree921f5d4fe0ed68a2dba08ae0a5f6d15f4caf4e5f /main/php_variables.c
parentc775c4cf83748d43be0e6c2b18b046ef99ccf3c9 (diff)
downloadphp-git-146517684d448fa693cee70c941fa93ee0844179.tar.gz
Fixed possible GLOBALS variable override when register_globals are ON.
Fixed possible register_globals toggle via parse_str().
Diffstat (limited to 'main/php_variables.c')
-rw-r--r--main/php_variables.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/main/php_variables.c b/main/php_variables.c
index 3242c0724b..e7124700f9 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -118,6 +118,13 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
zval_dtor(val);
return;
}
+
+ /* GLOBALS hijack attempt, reject parameter */
+ if (symtable1 == EG(active_symbol_table) && !strcmp("GLOBALS", var)) {
+ zval_dtor(val);
+ return;
+ }
+
/* ensure that we don't have spaces or dots in the variable name (not binary safe) */
for (p=var; *p; p++) {
switch (*p) {