From: Stanislav Malyshev <stas@php.net>
Date: Wed, 18 May 2005 18:01:13 +0000 (+0000)
Subject: fix #29890 - crash when function call fails
X-Git-Tag: php-5.0.5RC1~282
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc65afef4de2c1a84beabc66a46287899d1aba09;p=php

fix #29890 - crash when function call fails
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 01963e5fe6..1556957627 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -761,6 +761,11 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
 				zval *new_zval;
 
 				if (fci->no_separation) {
+					if(i) {
+						/* hack to clean up the stack */
+						zend_ptr_stack_n_push(&EG(argument_stack), 2, (void *) (long) i, NULL);
+						zend_ptr_stack_clear_multiple(TSRMLS_C);
+					}
 					return FAILURE;
 				}
 				ALLOC_ZVAL(new_zval);