MFH: - Move hash table destruction to proper location

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index eae406bdbf0f5a8ba38e2ceced62df4ca436a051..8904dbdc6b7ec944433d19979f230f567f4c697c 100644 (file)
--- 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 dc396649b7b24a95c9238a3d7dc7622a6a1aa66b..02c4bdca83e768ff4135b591b2bcaef736063973 100644 (file)
--- 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;
 }