archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed possible GLOBALS variable override when register_globals are ON.

Browse source 
Fixed possible register_globals toggle via parse_str().
This commit is contained in:
Ilia Alshanetsky 2005-09-28 22:31:29 +00:00
parent c775c4cf83
commit 146517684d
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/standard/string.c
View file

@ -4786,7 +4786,6 @@ PHP_FUNCTION(parse_str)
zval *sarg; zval *sarg;
char *res = NULL; char *res = NULL;
int argCount; int argCount;
int old_rg;
argCount = ZEND_NUM_ARGS(); argCount = ZEND_NUM_ARGS();
if (argCount < 1 || argCount > 2 || zend_get_parameters_ex(argCount, &arg, &arrayArg) == FAILURE) { 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)); res = estrndup(Z_STRVAL_P(sarg), Z_STRLEN_P(sarg));
} }
old_rg = PG(register_globals);
if (argCount == 1) { if (argCount == 1) {
PG(register_globals) = 1; zval tmp;
sapi_module.treat_data(PARSE_STRING, res, NULL TSRMLS_CC); Z_ARRVAL(tmp) = EG(active_symbol_table);
sapi_module.treat_data(PARSE_STRING, res, &tmp TSRMLS_CC);
} else { } else {
PG(register_globals) = 0;
/* Clear out the array that was passed in. */ /* Clear out the array that was passed in. */
zval_dtor(*arrayArg); zval_dtor(*arrayArg);
array_init(*arrayArg); array_init(*arrayArg);
sapi_module.treat_data(PARSE_STRING, res, *arrayArg TSRMLS_CC); sapi_module.treat_data(PARSE_STRING, res, *arrayArg TSRMLS_CC);
} }
PG(register_globals) = old_rg;
} }
/* }}} */ /* }}} */

7
main/php_variables.c
View file

@ -118,6 +118,13 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
zval_dtor(val); zval_dtor(val);
return; 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) */ /* ensure that we don't have spaces or dots in the variable name (not binary safe) */
for (p=var; *p; p++) { for (p=var; *p; p++) {
switch (*p) { switch (*p) {