Improved fix for MOPB-02-2007

This commit is contained in:
Ilia Alshanetsky 2007-06-03 16:19:14 +00:00
parent 79e3c88352
commit a8be5f419d
3 changed files with 53 additions and 3 deletions

View file

@ -125,8 +125,22 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
int new_idx_len = 0;
if(++nest_level > PG(max_input_nesting_level)) {
HashTable *ht;
/* too many levels of nesting */
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Input variable nesting level more than allowed %ld (change max_input_nesting_level in php.ini to increase the limit)", PG(max_input_nesting_level));
if (track_vars_array) {
ht = Z_ARRVAL_P(track_vars_array);
} else if (PG(register_globals)) {
ht = EG(active_symbol_table);
}
zend_hash_del(ht, var, var_len + 1);
zval_dtor(val);
if (!PG(display_errors)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level more than allowed %ld (change max_input_nesting_level in php.ini to increase the limit)", PG(max_input_nesting_level));
}
return;
}
ip++;
@ -142,9 +156,9 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
/* PHP variables cannot contain '[' in their names, so we replace the character with a '_' */
*(index_s - 1) = '_';
index_len = var_len = 0;
index_len = 0;
if (index) {
index_len = var_len = strlen(index);
index_len = strlen(index);
}
goto plain_var;
return;