summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-04-19 15:08:06 +0000
committerZeev Suraski <zeev@php.net>2000-04-19 15:08:06 +0000
commit67f6974373ce9871b6a7e39d12e80d724d1935d0 (patch)
tree995963e554d0a9d8ce7373b73f84a720bce41569 /Zend/zend_execute_API.c
parentfae56aee27e3ccb8b40cc914b382608be1ecda16 (diff)
downloadphp-git-67f6974373ce9871b6a7e39d12e80d724d1935d0.tar.gz
Initial support for trapping errors (not complete and disabled; will be enabled only
post-PHP 4.0.0)
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index cbdc121832..cf8a98f55b 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -115,6 +115,8 @@ void init_executor(CLS_D ELS_DC)
zend_hash_init(&EG(included_files), 5, NULL, NULL, 0);
EG(ticks_count) = 0;
+
+ EG(user_error_handler) = NULL;
}
@@ -154,8 +156,12 @@ void shutdown_executor(ELS_D)
signal(SIGSEGV, original_sigsegv_handler);
#endif
-
zend_hash_destroy(&EG(included_files));
+
+ if (EG(user_error_handler)) {
+ zval_dtor(EG(user_error_handler));
+ FREE_ZVAL(EG(user_error_handler));
+ }
}