diff options
| author | Xinchen Hui <laruence@php.net> | 2013-06-05 17:26:10 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-06-05 17:26:10 +0800 |
| commit | f597f5561e658643d2f7f6e35c12b283760e1ac3 (patch) | |
| tree | 91c586d8a356badcacdc1dab7359ff927ad1c81b /Zend/zend_execute_API.c | |
| parent | efdeec3c0eb8e1bd9d14af37be6979fb46eda5df (diff) | |
| parent | 3c87945c95c9c31986e690bb046c70e58c8d8896 (diff) | |
| download | php-git-f597f5561e658643d2f7f6e35c12b283760e1ac3.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
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 09e703ca59..9bffe9eff8 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)); |