- Move hash table destruction to proper location

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 85ebe92bbd1018a9dc665bdfb74de701a894ac34..96d3c6bb348b27af23ee26db00fc965b1d3bf86a 100644 (file)
--- 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 d60a35e6a4d3dc19dd97a10d62527f5f229270b0..a7d688abcb9d6d2137bc7cfa46a917872248613b 100644 (file)
--- 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;
 }