From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 28 Sep 2005 22:31:29 +0000 (+0000)
Subject: Fixed possible GLOBALS variable override when register_globals are ON.
X-Git-Tag: RELEASE_0_9_0~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=146517684d448fa693cee70c941fa93ee0844179;p=php

Fixed possible GLOBALS variable override when register_globals are ON.
Fixed possible register_globals toggle via parse_str().
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index eb72208648..4cc0573126 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -4786,7 +4786,6 @@ PHP_FUNCTION(parse_str)
 	zval *sarg;
 	char *res = NULL;
 	int argCount;
-	int old_rg;
 
 	argCount = ZEND_NUM_ARGS();
 	if (argCount < 1 || argCount > 2 || zend_get_parameters_ex(argCount, &arg, &arrayArg) == FAILURE) {
@@ -4799,19 +4798,18 @@ PHP_FUNCTION(parse_str)
 		res = estrndup(Z_STRVAL_P(sarg), Z_STRLEN_P(sarg));
 	}
 
-	old_rg = PG(register_globals);
 	if (argCount == 1) {
-		PG(register_globals) = 1;
-		sapi_module.treat_data(PARSE_STRING, res, NULL TSRMLS_CC);
+		zval tmp;
+		Z_ARRVAL(tmp) = EG(active_symbol_table);
+
+		sapi_module.treat_data(PARSE_STRING, res, &tmp TSRMLS_CC);
 	} else 	{
-		PG(register_globals) = 0;
 		/* Clear out the array that was passed in. */
 		zval_dtor(*arrayArg);
 		array_init(*arrayArg);
 		
 		sapi_module.treat_data(PARSE_STRING, res, *arrayArg TSRMLS_CC);
 	}
-	PG(register_globals) = old_rg;
 }
 /* }}} */
 
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) {