]> granicus.if.org Git - php/commitdiff
Typo when merging from trunk
authorXinchen Hui <laruence@php.net>
Sun, 11 Mar 2012 15:31:19 +0000 (15:31 +0000)
committerXinchen Hui <laruence@php.net>
Sun, 11 Mar 2012 15:31:19 +0000 (15:31 +0000)
Zend/zend_execute_API.c

index 9295a3a3074262db60a7f44ad580a2ac24b4fab2..47a37d8b9aecd04b5de9440ace07b36c3b06c134 100644 (file)
@@ -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 || UNEXPECTED(UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == EG(argument_stack)->top))) {
+                                       if (i || 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);