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
commit50ce16deff058dfbf2a04113e4bad1548521bc64 (patch)
treed7dec942b0e67b890d111c00470db675978d09d6 /Zend/zend_execute_API.c
parent8fe3ea75cb2fc9fe3b6e58340a07aa61f89079b2 (diff)
downloadphp-git-50ce16deff058dfbf2a04113e4bad1548521bc64.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 03d250cce7..e15344a4f0 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -289,7 +289,9 @@ void shutdown_executor(TSRMLS_D) /* {{{ */
zend_hash_reverse_apply(EG(class_table), (apply_func_t) zend_cleanup_user_class_data TSRMLS_CC);
zend_cleanup_internal_classes(TSRMLS_C);
}
+ } zend_end_try();
+ zend_try {
zend_vm_stack_destroy(TSRMLS_C);
zend_objects_store_free_object_storage(&EG(objects_store) TSRMLS_CC);