From 1bdfef5b389110d4826de51f89cb68d87f48fc8e Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 9 Jun 2005 16:56:59 +0000 Subject: [PATCH] Fixed double call to php_stream_close() on compiler errors --- Zend/zend.c | 2 ++ Zend/zend_execute_API.c | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index 7e173cd2b9..f30495f450 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -827,6 +827,8 @@ void zend_deactivate(TSRMLS_D) shutdown_compiler(TSRMLS_C); } zend_end_try(); + zend_destroy_rsrc_list(&EG(regular_list) TSRMLS_CC); + zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index b26767615a..bf6d718f18 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -285,11 +285,6 @@ void shutdown_executor(TSRMLS_D) clean_non_persistent_constants(TSRMLS_C); } zend_end_try(); - /* The regular list must be destroyed after the main symbol table, - * op arrays, and constants are destroyed. - */ - zend_destroy_rsrc_list(&EG(regular_list) TSRMLS_CC); - zend_try { #if ZEND_DEBUG signal(SIGSEGV, original_sigsegv_handler); -- 2.50.1