diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-05-31 13:01:57 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-05-31 13:01:57 +0000 |
| commit | 8df40bdb313d84bf606ce0052954b8031bc5a91f (patch) | |
| tree | b6c0786fdff94fe9b0133dcc72be2bb3046c9d2e /Zend/zend_builtin_functions.c | |
| parent | 51e52e20ef9f1947658827fabb4bcb36aee40afd (diff) | |
| download | php-git-8df40bdb313d84bf606ce0052954b8031bc5a91f.tar.gz | |
Keeping consistent arg_stack during arguments freeing (Exception from destructor may use inconsistent arg_stack for backtrace).
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 3d24311310..87ead12e3a 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1628,9 +1628,13 @@ static zval *debug_backtrace_get_args(void ***curpos TSRMLS_DC) while (--arg_count >= 0) { arg = (zval **) p++; - SEPARATE_ZVAL_TO_MAKE_IS_REF(arg); - (*arg)->refcount++; - add_next_index_zval(arg_array, *arg); + if (*arg) { + SEPARATE_ZVAL_TO_MAKE_IS_REF(arg); + (*arg)->refcount++; + add_next_index_zval(arg_array, *arg); + } else { + add_next_index_null(arg_array); + } } /* skip args from incomplete frames */ |