archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use Zend MM heap

Browse source
This commit is contained in:
Dmitry Stogov 2017-11-01 02:38:26 +03:00
parent fcb13fab6e
commit ed5b4d5c99
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/mbstring/php_mbregex.c
View file

@ -65,7 +65,6 @@ static int _php_mb_regex_globals_ctor(zend_mb_regex_globals *pglobals)
{
pglobals->default_mbctype = ONIG_ENCODING_UTF8;
pglobals->current_mbctype = ONIG_ENCODING_UTF8;
zend_hash_init(&(pglobals->ht_rc), 0, NULL, php_mb_regex_free_cache, 1);
ZVAL_UNDEF(&pglobals->search_str);
pglobals->search_re = (php_mb_regex_t*)NULL;
pglobals->search_pos = 0;
@ -79,7 +78,6 @@ static int _php_mb_regex_globals_ctor(zend_mb_regex_globals *pglobals)
/* {{{ _php_mb_regex_globals_dtor */
static void _php_mb_regex_globals_dtor(zend_mb_regex_globals *pglobals)
{
zend_hash_destroy(&pglobals->ht_rc);
}
/* }}} */
@ -126,7 +124,9 @@ PHP_MSHUTDOWN_FUNCTION(mb_regex)
/* {{{ PHP_RINIT_FUNCTION(mb_regex) */
PHP_RINIT_FUNCTION(mb_regex)
{
return MBSTRG(mb_regex_globals) ? SUCCESS: FAILURE;
if (!MBSTRG(mb_regex_globals)) return FAILURE;
zend_hash_init(&MBREX(ht_rc), 0, NULL, php_mb_regex_free_cache, 0);
return SUCCESS;
}
/* }}} */
@ -145,7 +145,7 @@ PHP_RSHUTDOWN_FUNCTION(mb_regex)
onig_region_free(MBREX(search_regs), 1);
MBREX(search_regs) = (OnigRegion *)NULL;
}
zend_hash_clean(&MBREX(ht_rc));
zend_hash_destroy(&MBREX(ht_rc));
return SUCCESS;
}