Index: main/php_variables.c
===================================================================
--- main/php_variables.c    (revision 321752)
+++ main/php_variables.c    (working copy)
@@ -179,14 +179,9 @@
                escaped_index = index;
                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)) {
-                       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);
@@ -225,14 +220,7 @@
                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)) {
-                   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);
@@ -271,6 +259,10 @@
            efree(val);
        }
        s = p + 1;
+       if (zend_hash_num_elements(Z_ARRVAL_P(array_ptr)) >= 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));
+           return;
+       }
    }
    if (s < e) {
        p = e;