diff options
| author | Marcus Boerger <helly@php.net> | 2004-05-12 10:17:12 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2004-05-12 10:17:12 +0000 |
| commit | 05a9f544a74ff026df2458a688b395cd61996329 (patch) | |
| tree | c1658821c057c707b2e0ca416c1c558e8d87f4bf | |
| parent | 2d6770f0e6d20eadc573bfc9cb0a7b78d473b5be (diff) | |
| download | php-git-05a9f544a74ff026df2458a688b395cd61996329.tar.gz | |
- Move hash table destruction to proper location
| -rw-r--r-- | ext/standard/basic_functions.c | 4 | ||||
| -rw-r--r-- | ext/standard/url_scanner_ex.re | 2 |
2 files changed, 4 insertions, 2 deletions
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; } |