From fdab05711375c317c6f68824bdca42d3cec50b31 Mon Sep 17 00:00:00 2001 From: foobar Date: Tue, 18 Jan 2005 11:01:21 +0000 Subject: [PATCH] MFH: - Move hash table destruction to proper location --- ext/standard/basic_functions.c | 4 ++++ ext/standard/url_scanner_ex.re | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index eae406bdbf..8904dbdc6b 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1000,6 +1000,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 dc396649b7..02c4bdca83 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -505,9 +505,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; } -- 2.50.1