Skip to content

Commit 560ff97

Browse files
committed
Reset MBREX(search_re) in RSHUTDOWN
This is going to cause a segfault if reused in the next request. To illustrate the issue, run these two scripts in sequence with the built-in server: // script1.php mb_ereg_search_init('foobar'); mb_ereg_search('foo'); // script2.php var_dump(mb_ereg_search_init("foobar")); var_dump(mb_ereg_search_pos());
1 parent 392ad20 commit 560ff97

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

ext/mbstring/php_mbregex.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ PHP_RSHUTDOWN_FUNCTION(mb_regex)
149149
ZVAL_UNDEF(&MBREX(search_str));
150150
}
151151
MBREX(search_pos) = 0;
152+
MBREX(search_re) = NULL;
152153

153154
if (MBREX(search_regs) != NULL) {
154155
onig_region_free(MBREX(search_regs), 1);

0 commit comments

Comments
 (0)