diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-05-31 13:02:15 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-05-31 13:02:15 +0000 |
| commit | 4e662470f77957e6edf0ca867a9e73888ec5fbb7 (patch) | |
| tree | fbe12149f815ee84abb144150484ce86aed1ac82 /Zend/zend_execute.h | |
| parent | 75fac72dc52ab24aaa14a2a1b520752961099044 (diff) | |
| download | php-git-4e662470f77957e6edf0ca867a9e73888ec5fbb7.tar.gz | |
Keeping consistent arg_stack during arguments freeing (Exception from destructor may use inconsistent arg_stack for backtrace).
Diffstat (limited to 'Zend/zend_execute.h')
| -rw-r--r-- | Zend/zend_execute.h | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |