summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-02-24 15:25:43 +0400
committerDmitry Stogov <dmitry@zend.com>2014-02-24 15:25:43 +0400
commitabb57cc1c2a92e6bb4f6cc732521163b8d9a8e4f (patch)
treec8a01f87f40dcd0e9ec8d8c642cd0f7d0d96e3e3 /Zend/zend_execute_API.c
parentf4c2810ab45293dea7b176069b73b33bb621fbb5 (diff)
parent93428dc6b902f23e56bf01e87c63ea0d6d6c03a4 (diff)
downloadphp-git-abb57cc1c2a92e6bb4f6cc732521163b8d9a8e4f.tar.gz
Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 97c3932ac8..1a074434df 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -251,14 +251,14 @@ void shutdown_executor(TSRMLS_D) /* {{{ */
* so that if handler used some class, crash would not happen */
if (Z_TYPE(EG(user_error_handler)) != IS_UNDEF) {
zeh = &EG(user_error_handler);
- ZVAL_UNDEF(&EG(user_error_handler));
zval_ptr_dtor(zeh);
+ ZVAL_UNDEF(&EG(user_error_handler));
}
if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) {
zeh = &EG(user_exception_handler);
- ZVAL_UNDEF(&EG(user_exception_handler));
zval_ptr_dtor(zeh);
+ ZVAL_UNDEF(&EG(user_exception_handler));
}
zend_stack_destroy(&EG(user_error_handlers_error_reporting));