cvs: ZendEngine2(PHP_5_0) / zend_execute_API.c

stas            Wed May 18 14:01:14 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /ZendEngine2        zend_execute_API.c 
  Log:
  fix #29890 - crash when function call fails
  
  
http://cvs.php.net/diff.php/ZendEngine2/zend_execute_API.c?r1=1.287.2.14&r2=1.287.2.15&ty=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.287.2.14 
ZendEngine2/zend_execute_API.c:1.287.2.15
--- ZendEngine2/zend_execute_API.c:1.287.2.14   Mon May  2 12:03:01 2005
+++ ZendEngine2/zend_execute_API.c      Wed May 18 14:01:13 2005
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.287.2.14 2005/05/02 16:03:01 helly Exp $ */
+/* $Id: zend_execute_API.c,v 1.287.2.15 2005/05/18 18:01:13 stas Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -761,6 +761,11 @@
                                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);

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php