diff options
| author | Dmitry Stogov <dmitry@php.net> | 2011-12-15 08:47:03 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2011-12-15 08:47:03 +0000 |
| commit | 0d1998e34ff487aab6451963d60697dd5b5b0115 (patch) | |
| tree | f6c64cf09aab3002ade5f0d48b7780fc98553e64 /main/php_variables.c | |
| parent | 2f0d084ab8228e1e5704a3fb66fb1c9cd6bd411e (diff) | |
| download | php-git-0d1998e34ff487aab6451963d60697dd5b5b0115.tar.gz | |
Added max_input_vars directive to prevent attacks based on hash collisions
Diffstat (limited to 'main/php_variables.c')
| -rw-r--r-- | main/php_variables.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 73803e136d..40d549a937 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -191,6 +191,9 @@ 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)); + } 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); @@ -236,6 +239,9 @@ 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)); + } zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); } if (escaped_index != index) { |