clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFH: Fixed possible GLOBALS variable override when register_globals are ON.

Browse Source 
MFH: Fixed possible register_globals toggle via parse_str().
MFH: Fixed negative offset handling in substr_compare() function.
This commit is contained in:
Ilia Alshanetsky 2005-09-28 22:39:52 +00:00
parent ba5f66777e
commit 1a04335ec2
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -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()

14
ext/standard/string.c
View File

@ -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) {

7
main/php_variables.c
View File

@ -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) {