Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/mbstring/php_mbregex.c
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,7 @@ PHP_FUNCTION(mb_ereg_search_getregs)
add_index_bool(return_value, i, 0);
}
}
if (onig_number_of_names(MBREX(search_re)) > 0) {
if (MBREX(search_re) != NULL && onig_number_of_names(MBREX(search_re)) > 0) {
mb_regex_groups_iter_args args = {
return_value,
Z_STRVAL(MBREX(search_str)),
Expand Down
26 changes: 26 additions & 0 deletions ext/mbstring/tests/gh21036_mb_ereg_search_getregs_null.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--TEST--
GH-21036 (mb_ereg_search_getregs() crash after mb_eregi() invalidates search_re)
--CREDITS--
vi3tL0u1s
--EXTENSIONS--
mbstring
--SKIPIF--
<?php
if (!function_exists("mb_ereg_search_init")) die("skip mb_ereg_search_init() not available");
?>
--FILE--
<?php
// mb_eregi() can invalidate MBREX(search_re) via regex cache eviction
// while MBREX(search_regs) remains valid, causing NULL pointer dereference

mb_ereg_search_init("a", "a");
mb_ereg_search_pos();
mb_eregi("a", "a"); // This invalidates search_re
$result = mb_ereg_search_getregs(); // Should not crash
var_dump($result);
?>
--EXPECT--
array(1) {
[0]=>
string(1) "a"
}
Loading