From: Marcus Boerger <helly@php.net>
Date: Wed, 12 May 2004 10:17:12 +0000 (+0000)
Subject: - Move hash table destruction to proper location
X-Git-Tag: RELEASE_0_1~225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05a9f544a74ff026df2458a688b395cd61996329;p=php

- Move hash table destruction to proper location
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 85ebe92bbd..96d3c6bb34 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -951,6 +951,10 @@ static void basic_globals_dtor(php_basic_globals *basic_globals_p TSRMLS_DC)
 	if (BG(sm_allowed_env_vars)) {
 		free(BG(sm_allowed_env_vars));
 	}
+	if (BG(url_adapt_state_ex).tags) {
+		zend_hash_destroy(BG(url_adapt_state_ex).tags);
+		free(BG(url_adapt_state_ex).tags);
+	}
 }
 
 
diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index d60a35e6a4..a7d688abcb 100644
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -490,8 +490,6 @@ PHP_MINIT_FUNCTION(url_scanner)
 PHP_MSHUTDOWN_FUNCTION(url_scanner)
 {
 	UNREGISTER_INI_ENTRIES();
-	zend_hash_destroy(BG(url_adapt_state_ex).tags);
-	free(BG(url_adapt_state_ex).tags);
 
 	return SUCCESS;
 }