Fixed crash that occurs due to an abused persistent hashtable.

# thanks Sascha again.

diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index 8d1289a8f7ad742e499f01b445f229d5441820b6..74246859ae1177c0d1a93f69716e538026d8061e 100644 (file)
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -96,7 +96,6 @@ void _php_mb_regex_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
 {
        MBSTRG(default_mbctype) = MBCTYPE_EUC;
        MBSTRG(current_mbctype) = MBCTYPE_EUC;
-       zend_hash_init(&(MBSTRG(ht_rc)), 0, NULL, (void (*)(void *)) php_mb_regex_free_cache, 1);
        MBSTRG(search_str) = (zval**)0;
        MBSTRG(search_str_val) = (zval*)0;
        MBSTRG(search_re) = (mb_regex_t*)0;
@@ -108,7 +107,6 @@ void _php_mb_regex_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC)
 /* {{{ _php_mb_regex_globals_dtor */
 void _php_mb_regex_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC) 
 {
-       zend_hash_destroy(&MBSTRG(ht_rc));
 }
 /* }}} */
 
@@ -138,6 +136,7 @@ PHP_MSHUTDOWN_FUNCTION(mb_regex)
 PHP_RINIT_FUNCTION(mb_regex)
 {
        MBSTRG(regex_default_options) = MBRE_OPTION_POSIXLINE;
+       zend_hash_init(&(MBSTRG(ht_rc)), 0, NULL, (void (*)(void *)) php_mb_regex_free_cache, 0);
 
        return SUCCESS;
 }
@@ -167,7 +166,7 @@ PHP_RSHUTDOWN_FUNCTION(mb_regex)
                efree(MBSTRG(search_regs));
                MBSTRG(search_regs) = (struct mbre_registers*)0;
        }
-       zend_hash_clean(&MBSTRG(ht_rc));
+       zend_hash_destroy(&MBSTRG(ht_rc));
 
        return SUCCESS;
 }