Merge branch 'PHP-7.4'

* PHP-7.4:
  Reset MBREX(search_re) in RSHUTDOWN
This commit is contained in:
Nikita Popov 2020-01-29 16:05:47 +01:00
commit 22d2a80031

View file

@ -154,6 +154,7 @@ PHP_RSHUTDOWN_FUNCTION(mb_regex)
ZVAL_UNDEF(&MBREX(search_str));
}
MBREX(search_pos) = 0;
MBREX(search_re) = NULL;
if (MBREX(search_regs) != NULL) {
onig_region_free(MBREX(search_regs), 1);