From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 9 Jun 2005 16:57:43 +0000 (+0000)
Subject: Fixed double call to php_stream_close() on compiler errors
X-Git-Tag: php-5.0.1b1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59a46c34fa39e7dff0cb116c42cf2879d02f32a1;p=php

Fixed double call to php_stream_close() on compiler errors
---

diff --git a/Zend/zend.c b/Zend/zend.c
index ab66e16ee9..3aac409bc7 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -826,6 +826,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 b37b0f6119..597a89e2f2 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -276,11 +276,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);