Fixed double call to php_stream_close() on compiler errors

diff --git a/Zend/zend.c b/Zend/zend.c
index ab66e16ee92e32620ed2200abc4efd1408ce5c8f..3aac409bc799f6bf66d604169c20a9f94a43d64d 100644 (file)
--- 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 b37b0f61199a5bc26fc54ff6db18c7f1dd093f1d..597a89e2f23d7e8b5d5adcb80aab3de706795579 100644 (file)
--- 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);