diff options
| author | Dmitry Stogov <dmitry@php.net> | 2011-12-22 15:31:41 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2011-12-22 15:31:41 +0000 |
| commit | 8dad134ad73c010083a6439417fa84ce88dbdfb6 (patch) | |
| tree | e4710a02286f9fd5599ab322853f85a9d4a56f63 /main | |
| parent | af07705f970e4c58b85a1b53193bc04e0e095a78 (diff) | |
| download | php-git-8dad134ad73c010083a6439417fa84ce88dbdfb6.tar.gz | |
Change fatal error into warning and ignore arguments over limit
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_variables.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 40d549a937..ba9a00f011 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -191,12 +191,14 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars } if (zend_symtable_find(symtable1, escaped_index, index_len + 1, (void **) &gpc_element_p) == FAILURE || Z_TYPE_PP(gpc_element_p) != IS_ARRAY) { - if (zend_hash_num_elements(symtable1) >= PG(max_input_vars)) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); + if (zend_hash_num_elements(symtable1) <= PG(max_input_vars)) { + if (zend_hash_num_elements(symtable1) == PG(max_input_vars)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); + } + MAKE_STD_ZVAL(gpc_element); + array_init(gpc_element); + zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); } - MAKE_STD_ZVAL(gpc_element); - array_init(gpc_element); - zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); } if (index != escaped_index) { efree(escaped_index); @@ -239,10 +241,14 @@ plain_var: zend_symtable_exists(symtable1, escaped_index, index_len + 1)) { zval_ptr_dtor(&gpc_element); } else { - if (zend_hash_num_elements(symtable1) >= PG(max_input_vars)) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); + if (zend_hash_num_elements(symtable1) <= PG(max_input_vars)) { + if (zend_hash_num_elements(symtable1) == PG(max_input_vars)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); + } + zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); + } else { + zval_ptr_dtor(&gpc_element); } - zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); } if (escaped_index != index) { efree(escaped_index); |