From 4e662470f77957e6edf0ca867a9e73888ec5fbb7 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 31 May 2006 13:02:15 +0000 Subject: Keeping consistent arg_stack during arguments freeing (Exception from destructor may use inconsistent arg_stack for backtrace). --- Zend/zend_execute.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Zend/zend_execute.h') diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 74773f2036..09432f77b4 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -152,7 +152,9 @@ static inline void zend_ptr_stack_clear_multiple(TSRMLS_D) EG(argument_stack).top -= (delete_count+2); while (--delete_count>=0) { - zval_ptr_dtor((zval **) --p); + zval *q = *(zval **)(--p); + *p = NULL; + zval_ptr_dtor(&q); } EG(argument_stack).top_element = p; } -- cgit v1.2.1