Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes)

diff --git a/NEWS b/NEWS
index 5c4c8ac396d9521229cefbd0ad7387958308fe80..03a46976db3036a8b621d5ef41a5c84645e86c27 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2012, PHP 5.3.11
 
 - Core:
+  . Fixed bug #61273 (call_user_func_array with more than 16333 arguments
+    leaks / crashes). (Laruence)
   . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
   . Improved max_input_vars directive to check nested variables (Dmitry).
   . Fixed bug #61095 (Incorect lexing of 0x00*+<NUM>). (Etienne)

diff --git a/Zend/tests/bug61273.phpt b/Zend/tests/bug61273.phpt
new file mode 100644 (file)
index 0000000..9d78b27
--- /dev/null
+++ b/Zend/tests/bug61273.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes)
+--FILE--
+<?php
+/**
+ * for 5.3 #define ZEND_VM_STACK_PAGE_SIZE ((64 * 1024) - 64)
+ * for 5.4 #define ZEND_VM_STACK_PAGE_SIZE ((16 * 1024) - 16)
+ * we should trick EG(argument_stack) into growing
+ */
+$args = array_fill(0, 64 * 1024 - 64, "*");
+call_user_func_array(function(&$a) {}, $args);
+echo strval("okey");
+--EXPECTF--
+Warning: Parameter 1 to {closure}() expected to be a reference, value given in %sbug61273.php on line %d
+okey

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 9ca21ad98e38762e1ca354e4b8e235a99fa0c6ff..9295a3a3074262db60a7f44ad580a2ac24b4fab2 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -877,7 +877,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
 
                                if (fci->no_separation &&
                                    !ARG_MAY_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
-                                       if(i) {
+                                       if (i || UNEXPECTED(UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == EG(argument_stack)->top))) {
                                                /* hack to clean up the stack */
                                                zend_vm_stack_push_nocheck((void *) (zend_uintptr_t)i TSRMLS_CC);
                                                zend_vm_stack_clear_multiple(TSRMLS_C);