archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix for bugs 13961, 39927 and 45947

Browse source
This commit is contained in:
Rasmus Lerdorf 2008-08-30 16:47:46 +00:00
parent 820c2002e4
commit f52d71d18e
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
main/php_variables.c
View file

@ -57,11 +57,12 @@ PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zva
php_register_variable_ex(var, &new_entry, track_vars_array TSRMLS_CC);
}
PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_array TSRMLS_DC)
PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars_array TSRMLS_DC)
{
char *p = NULL;
char *ip; /* index pointer */
char *index, *escaped_index = NULL;
char *var, *var_orig;
int var_len, index_len;
zval *gpc_element, **gpc_element_p;
zend_bool is_array = 0;
@ -87,6 +88,8 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
* Prepare variable name
*/
var_orig = estrdup(var_name);
var = var_orig;
/* ignore leading spaces in the variable name */
while (*var && *var==' ') {
var++;
@ -107,6 +110,7 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
if (var_len==0) { /* empty variable name, or variable name with a space in it */
zval_dtor(val);
efree(var_orig);
return;
}
@ -115,6 +119,7 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
var_len == sizeof("GLOBALS")-1 &&
!memcmp(var, "GLOBALS", sizeof("GLOBALS")-1)) {
zval_dtor(val);
efree(var_orig);
return;
}
@ -146,6 +151,7 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
if (!PG(display_errors)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level exceeded %ld. To increase the limit change max_input_nesting_level in php.ini.", PG(max_input_nesting_level));
}
efree(var_orig);
return;
}
@ -237,6 +243,7 @@ plain_var:
}
}
}
efree(var_orig);
}
SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler)