From 1a04335ec2f384715b27e1741df728a28c5734a9 Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 28 Sep 2005 22:39:52 +0000
Subject: [PATCH] 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.

---
 NEWS                  |  3 +++
 ext/standard/string.c | 14 ++++++++------
 main/php_variables.c  |  7 +++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 7a055f9ce2..2b5fe0c37f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Aug 2005, PHP 5.1 Release Candidate 2
+- Fixed possible GLOBALS variable override when register_globals are ON.
+  (Ilia, Stefan)
+- Fixed possible register_globals toggle via parse_str(). (Ilia, Stefan)
 - Changed SQLite extension to be a shared module in Windows distribution.
   (Edin)
 - Changed "instanceof" and "catch" operators, is_a() and is_subclass_of()
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 347839b3f3..9ab31ba57f 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -3857,7 +3857,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) {
@@ -3870,19 +3869,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;
 }
 /* }}} */
 
@@ -4883,6 +4881,10 @@ PHP_FUNCTION(substr_compare)
 		RETURN_FALSE;
 	}
 
+	if (offset < 0) {
+		offset = s1_len + offset;
+	}
+
 	cmp_len = (uint) (len ? len : MAX(s2_len, (s1_len - offset)));
 
 	if (!cs) {
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) {
-- 
2.50.1