diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-29 16:05:38 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-29 16:05:38 +0100 |
| commit | 085371b2994f7aa96e7b63cee81fc79194049892 (patch) | |
| tree | 72095c106d65167c6f3bc858547c549f46509966 /ext/mbstring/php_mbregex.c | |
| parent | bdcfdd4402b0b7c10a1ad27a5b7f8ac754886344 (diff) | |
| parent | 560ff9725e6fb05942dd0c891c8a4496c57bcb4b (diff) | |
| download | php-git-085371b2994f7aa96e7b63cee81fc79194049892.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 11f63858b2..882978479e 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -156,6 +156,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); |