Skip to content
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

Fix GH-15824 mb_detect_encoding() invalid "UTF8" #15829

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Fix GH-15824 mb_detect_encoding() invalid "UTF8" #15829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ const mbfl_encoding *mbfl_name2encoding_ex(const char *name, size_t name_len)
/* search MIME charset name */
for (encoding = mbfl_encoding_ptr_list; *encoding; encoding++) {
if ((*encoding)->mime_name) {
if (strcasecmp((*encoding)->mime_name, name) == 0) {
if (strncasecmp((*encoding)->mime_name, name, name_len) == 0 && (*encoding)->mime_name[name_len] == '\0') {
return *encoding;
}
}
Expand All @@ -359,7 +359,7 @@ const mbfl_encoding *mbfl_name2encoding_ex(const char *name, size_t name_len)
for (encoding = mbfl_encoding_ptr_list; *encoding; encoding++) {
if ((*encoding)->aliases) {
for (const char **alias = (*encoding)->aliases; *alias; alias++) {
if (strcasecmp(*alias, name) == 0) {
if (strncasecmp(name, *alias, name_len) == 0 && (*alias)[name_len] == '\0') {
return *encoding;
}
}
Expand Down
37 changes: 37 additions & 0 deletions ext/mbstring/tests/gh15824.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
--TEST--
GH-15824 (ValueError: mb_detect_encoding(): Argument #2 ($encodings) contains invalid encoding "UTF8")
--EXTENSIONS--
mbstring
--FILE--
<?php
echo "== alias name ==\n";
var_dump(mb_detect_encoding('abc', 'UTF8, ASCII'));
var_dump(mb_detect_encoding('こんにちは', 'UTF8, ASCII'));
var_dump(mb_detect_encoding('こんにちは', 'ASCII, UTF8'));
var_dump(mb_detect_encoding("\xC5", 'US-ASCII, LATIN4'));
var_dump(mb_detect_encoding("\xC5", 'US-ASCII, cyrillic'));
/* 0x9D is not located in CP1254 */
var_dump(mb_detect_encoding("\x9D", 'US-ASCII, CP1254, cyrillic'));
var_dump(mb_detect_encoding("\x9D", 'US-ASCII, CP1254, cyrillic', false));

echo "== mime name ==\n";
var_dump(mb_detect_encoding('abc', 'ANSI_X3.4-1968, ISO-8859-1'));
var_dump(mb_detect_encoding('abc', 'CP50220, ANSI_X3.4-1968'));
/* last comma is not mistake, intentionally */
var_dump(mb_detect_encoding(bin2hex('1b24422422242424262428242a1b2842'), 'CP50220, ANSI_X3.4-1968,', false));
var_dump(mb_detect_encoding('😄', 'US-ASCII, UTF-8-Mobile#KDDI-B, UTF-8'));
?>
--EXPECT--
== alias name ==
string(5) "UTF-8"
string(5) "UTF-8"
string(5) "UTF-8"
string(10) "ISO-8859-4"
string(10) "ISO-8859-5"
string(10) "ISO-8859-5"
string(10) "ISO-8859-5"
== mime name ==
string(5) "ASCII"
string(7) "CP50220"
string(7) "CP50220"
string(19) "UTF-8-Mobile#KDDI-B"
Loading