diff options
| author | Xinchen Hui <laruence@php.net> | 2013-06-05 17:30:09 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-06-05 17:30:09 +0800 |
| commit | e89537f2a349d5d1f401e010ec6f17cff4035719 (patch) | |
| tree | ca8bc95e32a352eb4578f63a86e18c8240dd825d /Zend/zend_execute_API.c | |
| parent | 785f4c5fc68422ae23c1acc37b823f214c52ca5d (diff) | |
| parent | 3c93402f86bc0a0a9cdf87b480d8bb856e360059 (diff) | |
| download | php-git-e89537f2a349d5d1f401e010ec6f17cff4035719.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
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 8739e21c2b..d831b107a1 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -254,15 +254,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)); |