From: Thies C. Arntzen <thies@php.net>
Date: Tue, 1 Feb 2000 11:41:15 +0000 (+0000)
Subject: moved destroying of garbage before resource-list gets destroyed - (see my previous... 
X-Git-Tag: BEFORE_SAPIFICATION_FEB_10_2000~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11f53347c7e7d14c750a0ffe898f3ad22b205570;p=php

moved destroying of garbage before resource-list gets destroyed - (see my previous mail)
zeev, andi - please comment!
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 62b4cee1f6..a58cdf06cc 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -134,6 +134,12 @@ void shutdown_executor(ELS_D)
 
 	zend_hash_destroy(&EG(symbol_table));
 
+	while (EG(garbage_ptr)--) {
+		if (EG(garbage)[EG(garbage_ptr)]->refcount==1) {
+			zval_ptr_dtor(&EG(garbage)[EG(garbage_ptr)]);
+		}
+	}
+
 	destroy_resource_list(ELS_C); /* must be destroyed after the main symbol table is destroyed */
 
 	zend_ptr_stack_destroy(&EG(argument_stack));
@@ -145,11 +151,7 @@ void shutdown_executor(ELS_D)
 #if ZEND_DEBUG
 	signal(SIGSEGV, original_sigsegv_handler);
 #endif
-	while (EG(garbage_ptr)--) {
-		if (EG(garbage)[EG(garbage_ptr)]->refcount==1) {
-			zval_ptr_dtor(&EG(garbage)[EG(garbage_ptr)]);
-		}
-	}
+
 
 	zend_hash_destroy(&EG(imported_files));
 }