diff options
| author | Xinchen Hui <laruence@php.net> | 2013-06-05 17:25:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-06-05 17:25:00 +0800 |
| commit | 3c87945c95c9c31986e690bb046c70e58c8d8896 (patch) | |
| tree | c6e6c2c2a91fefa10105cb6815aabea9d5b8e8b7 /Zend/zend_execute_API.c | |
| parent | 93e0d78ec655f59ebfa82b2c6f8486c43651c1d0 (diff) | |
| download | php-git-3c87945c95c9c31986e690bb046c70e58c8d8896.tar.gz | |
Fixed bug #64960 (Segfault in gc_zval_possible_root)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 97818895ef..687520d1a4 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -263,15 +263,13 @@ void shutdown_executor(TSRMLS_D) /* {{{ */ if (EG(user_error_handler)) { zeh = EG(user_error_handler); EG(user_error_handler) = NULL; - zval_dtor(zeh); - FREE_ZVAL(zeh); + zval_ptr_dtor(&zeh); } if (EG(user_exception_handler)) { zeh = EG(user_exception_handler); EG(user_exception_handler) = NULL; - zval_dtor(zeh); - FREE_ZVAL(zeh); + zval_ptr_dtor(&zeh); } zend_stack_destroy(&EG(user_error_handlers_error_reporting)); |