diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-29 16:05:47 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-29 16:05:47 +0100 |
| commit | 22d2a80031bc62d6f9b6fb29305da85522b260a1 (patch) | |
| tree | 71e63ccdf35bcff21527627b8c46128628184fe7 /ext/mbstring/php_mbregex.c | |
| parent | b8d635cd221ea1afe883187955b8ae8315c36043 (diff) | |
| parent | 085371b2994f7aa96e7b63cee81fc79194049892 (diff) | |
| download | php-git-22d2a80031bc62d6f9b6fb29305da85522b260a1.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Reset MBREX(search_re) in RSHUTDOWN
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index d7c236fd4a..8de9d2d302 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -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); |