summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2005-09-28 22:39:52 +0000
committerIlia Alshanetsky <iliaa@php.net>2005-09-28 22:39:52 +0000
commit1a04335ec2f384715b27e1741df728a28c5734a9 (patch)
tree80440d0d0d2195139f29f88288cdb96c92b999c8 /main
parentba5f66777eecd392f6f2b5c7460b7c53bf6ad51c (diff)
downloadphp-git-1a04335ec2f384715b27e1741df728a28c5734a9.tar.gz
MFH: Fixed possible GLOBALS variable override when register_globals are ON.
MFH: Fixed possible register_globals toggle via parse_str(). MFH: Fixed negative offset handling in substr_compare() function.
Diffstat (limited to 'main')
-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 4479d6cc77..a68abb0898 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -99,6 +99,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) {