Skip to content

[pull] master from php:master #1116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jul 23, 2026
+39 −1
Merged

[pull] master from php:master #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d6ab53
Fix GH-22779: mb_strrpos() wrong result in a non-UTF-8 encoding
eyupcanakman Jul 17, 2026
e0a9940
Merge branch 'PHP-8.4' into PHP-8.5
alexdowad Jul 23, 2026
4983e8b
Merge branch 'PHP-8.5'
alexdowad Jul 23, 2026
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
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ PHP NEWS
. Fixed header injection through the Content-Type context option, the
soapaction and the cookie names and values. (David Carlier)

- MBString:
. Fixed bug GH-22779 (mb_strrpos() returns the wrong position for a negative
offset in a non-UTF-8 encoding). (Eyüp Can Akman)

- Sockets:
. Fixed socket_set_option() validation error messages for UDP_SEGMENT and
TCP_USER_TIMEOUT, and SO_LINGER options. (Weilin Du)
Expand Down
2 changes: 1 addition & 1 deletion ext/mbstring/mbstring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1942,7 +1942,7 @@ static size_t mb_find_strpos(zend_string *haystack, zend_string *needle, const m
} else if (offset >= 0) {
found_pos = zend_memnrstr((const char*)offset_pointer, ZSTR_VAL(needle_u8), ZSTR_LEN(needle_u8), ZSTR_VAL(haystack_u8) + ZSTR_LEN(haystack_u8));
} else {
size_t needle_len = pointer_to_offset_utf8((unsigned char*)ZSTR_VAL(needle), (unsigned char*)ZSTR_VAL(needle) + ZSTR_LEN(needle));
size_t needle_len = pointer_to_offset_utf8((unsigned char*)ZSTR_VAL(needle_u8), (unsigned char*)ZSTR_VAL(needle_u8) + ZSTR_LEN(needle_u8));
offset_pointer = offset_to_pointer_utf8(offset_pointer, (unsigned char*)ZSTR_VAL(haystack_u8) + ZSTR_LEN(haystack_u8), needle_len);
if (!offset_pointer) {
offset_pointer = (unsigned char*)ZSTR_VAL(haystack_u8) + ZSTR_LEN(haystack_u8);
Expand Down
34 changes: 34 additions & 0 deletions ext/mbstring/tests/gh22779.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
--TEST--
GH-22779: mb_strrpos() wrong result for a negative offset in a non-UTF-8 encoding
--EXTENSIONS--
mbstring
--FILE--
<?php
/* mb_strrpos() with a negative offset must return the correct position in non-UTF-8 encodings. */
$haystack = "\xA9\xA9X";
$needle = "\xA9";
foreach ([-1, -2, -3] as $offset) {
var_dump(mb_strrpos($haystack, $needle, $offset, 'ISO-8859-1'));
}
var_dump(mb_strrpos("X\xA9", "\xA9", -1, 'ISO-8859-1'));
var_dump(mb_strrpos("\x95Z\x95Z", "\x95", -1, 'Windows-1252'));
var_dump(mb_strrpos("\x95Z\x95Z", "\x95", -2, 'Windows-1252'));
// Two-byte needle in a single-byte encoding.
var_dump(mb_strrpos("\xA9\xB0\xA9\xB0Z", "\xA9\xB0", -2, 'ISO-8859-1'));
// Multibyte: "ああA" in Shift_JIS, needle "あ" (\x82\xA0).
var_dump(mb_strrpos("\x82\xA0\x82\xA0A", "\x82\xA0", -2, 'SJIS'));
var_dump(mb_strrpos("\x82\xA0\x82\xA0A", "\x82\xA0", -3, 'SJIS'));
// UTF-16: an ASCII needle miscounts the other way.
var_dump(mb_strrpos("\x00A\x00X\x00A", "\x00A", -2, 'UTF-16BE'));
?>
--EXPECT--
int(1)
int(1)
int(0)
int(1)
int(2)
int(2)
int(2)
int(1)
int(0)
int(0)