summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2011-04-15 12:43:20 +0000
committerDmitry Stogov <dmitry@php.net>2011-04-15 12:43:20 +0000
commit92e5b10c41668b1ceb55030a76cb74d41dac82d3 (patch)
treeee2c6c13319736504ace5fafaec942a7a8449b15 /Zend/zend_execute_API.c
parent833ec62d7cb7b327dbb4a77dda32b10d76dad396 (diff)
downloadphp-git-92e5b10c41668b1ceb55030a76cb74d41dac82d3.tar.gz
Fixed bug #54268 (Double free when destroy_zend_class fails)
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 0ad62a2e00..3717f43fbf 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -296,7 +296,9 @@ void shutdown_executor(TSRMLS_D) /* {{{ */
zend_hash_reverse_apply(EG(function_table), (apply_func_t) zend_cleanup_function_data TSRMLS_CC);
}
zend_hash_apply(EG(class_table), (apply_func_t) zend_cleanup_class_data TSRMLS_CC);
+ } zend_end_try();
+ zend_try {
zend_vm_stack_destroy(TSRMLS_C);
zend_objects_store_free_object_storage(&EG(objects_store) TSRMLS_CC);