Skip to content

Fix GH-20674 mb_decode_mimeheader does not handle separator #20677

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

Open
youkidearitai wants to merge 6 commits into
base: PHP-8.3
Choose a base branch
from
+43 −1
Open

Fix GH-20674 mb_decode_mimeheader does not handle separator #20677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d29c866
Fix GH-20674 mb_decode_mimeheader does not handle separator
youkidearitai Dec 10, 2025
c2e0d8d
Add tab for backward compatible
youkidearitai Dec 11, 2025
1e8b747
Add test case from RFC2047 and fix last pattern
youkidearitai Dec 11, 2025
fdd4e84
Fix duplicate test case
youkidearitai Dec 12, 2025
be2b264
Revert "Fix duplicate test case"
youkidearitai Dec 12, 2025
9e12326
Sort RFC 2047 example test case
youkidearitai Dec 12, 2025
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: 3 additions & 1 deletion ext/mbstring/mbstring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6395,13 +6395,15 @@ static zend_string* mb_mime_header_decode(zend_string *input, const mbfl_encodin
p = temp;
/* Decoding of MIME encoded word was successful;
* Try to collapse a run of whitespace */
if (p < e && (*p == '\n' || *p == '\r')) {
if (p < e && (*p == '\n' || *p == '\r' || *p == '\t' || *p == ' ')) {
do {
p++;
} while (p < e && (*p == '\n' || *p == '\r' || *p == '\t' || *p == ' '));
/* We will only actually output a space if this is not immediately followed
* by another valid encoded word */
space_pending = true;
} else {
space_pending = false;
}
continue;
}
Expand Down
40 changes: 40 additions & 0 deletions ext/mbstring/tests/gh20674.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
--TEST--
GH-20674 (mb_decode_mimeheader does not handle separator)
--EXTENSIONS--
mbstring
--FILE--
<?php

$subject = '=?us-ascii?Q?The_PH?= =?us-ascii?Q?P_8.5?=';
var_dump(mb_decode_mimeheader($subject));

// mb_decode_mimeheader's backward compatible for TAB(\t)
$subject = "=?us-ascii?Q?The_PH?=\t=?us-ascii?Q?P_8.5?=";
var_dump(mb_decode_mimeheader($subject));

$subject = "=?us-ascii?Q?The_PH?=\t =?us-ascii?Q?P_8.5?=";
var_dump(mb_decode_mimeheader($subject));

$subject = "=?us-ascii?Q?The_PH?= \t =?us-ascii?Q?P_8.5?=";
var_dump(mb_decode_mimeheader($subject));

// from RFC 2047 https://www.ietf.org/rfc/rfc2047#section-8
var_dump(mb_decode_mimeheader("(=?ISO-8859-1?Q?a?=)"));
var_dump(mb_decode_mimeheader("(=?ISO-8859-1?Q?a?= b)"));
var_dump(mb_decode_mimeheader("(=?ISO-8859-1?Q?a_b?=)"));
var_dump(mb_decode_mimeheader("(=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)"));
var_dump(mb_decode_mimeheader("(=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)"));
var_dump(mb_decode_mimeheader("(=?ISO-8859-1?Q?a?=
=?ISO-8859-1?Q?b?=)"));
?>
--EXPECTF--
string(11) "The PHP 8.5"
string(11) "The PHP 8.5"
string(11) "The PHP 8.5"
string(11) "The PHP 8.5"
string(3) "(a)"
string(5) "(a b)"
string(5) "(a b)"
string(4) "(ab)"
string(4) "(ab)"
string(4) "(ab)"
Loading