Skip to content

Some more fixes for decoding of headers #440

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
jsuto merged 3 commits into from
Apr 8, 2026
+19 −7
Merged

Some more fixes for decoding of headers #440

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
d338f46
Fix decoding of header lines folded with TAB characters
Mar 31, 2026
f6b4655
Fix quoted printable encoded words containing nothing but a 'b'
Mar 31, 2026
031be62
Added more testcases for fixupEncodedHeaderLine(...) covering:
Mar 31, 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
23 changes: 16 additions & 7 deletions src/parser_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,17 @@ void fixupEncodedHeaderLine(char *buf, int buflen){

memset(puf, 0, sizeof(puf));

/*
* Replace TAB with SPACE so split_string(q, " ", ...) will also do its
* job when header lines are folded with tabs.
*/
q = buf;
while(*q){
if(*q == '\t')
*q = ' ';
++q;
}

q = buf;

do {
Expand All @@ -361,7 +372,7 @@ void fixupEncodedHeaderLine(char *buf, int buflen){
r = strstr(q, "=?");
if(r){
s = q;
while(s < r && (*s == ' ' || *s == '\t'))
while(s < r && *s == ' ')
++s;
if(s == r)
q = r;
Expand Down Expand Up @@ -410,16 +421,14 @@ void fixupEncodedHeaderLine(char *buf, int buflen){
snprintf(encoding, sizeof(encoding)-1, "%s", p);
*e = '?';

s = strcasestr(e, "?B?");
if(s){
if(strncasecmp(e, "?B?", 3) == 0){
b64 = 1;
p = s + 3;
p = e + 3;
}
else {
s = strcasestr(e, "?Q?");
if(s){
if(strncasecmp(e, "?Q?", 3) == 0){
qp = 1;
p = s + 3;
p = e + 3;
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions unit_tests/check_parser_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ static void test_fixupEncodedHeaderLine(){
{"=?gb2312?B?yc/Gz76pIC0gw7/fTMir0bKy6YjzuOYgKDIwMTcxMDMwLTMxKSBHQlcgUG9k?==?gb2312?Q?ium_&_Basement.docx?=", "上葡京 - 每週全巡查報告 (20171030-31) GBW Podium & Basement.docx"},
{"Subject: =?UTF-8?Q?=E2=98=85_JubiDu!Versandkost?= =?UTF-8?Q?enfrei-Verl=C3=A4ngerung!=E2=98=85?=", "Subject: ★ JubiDu!Versandkostenfrei-Verlängerung!★"},
{"Happy New Year! =?utf-8?q?=F0=9F=8E=86?=", "Happy New Year! 🎆"},
{"P=?utf-8?B?w6Q=?=chter ohne Augenma=?iso-8859-1?Q?=DF?= sind =?iso-8859-1?Q?=FC?=bel", "Pächter ohne Augenmaß sind übel"},
{"=?iso-8859-1?Q?FooBarFoo-AG_=22ABCDEF=22:_Mit_Digitalminister_Hoffmeiser_?=\t=?iso-8859-1?Q?zum_=22EU_Sonder_Gipfel=22_in_Wacken=2C_10._-_22.04.2026_-?= =?iso-8859-1?Q?_Sitzplatzvergabeverfahren_f=FCr_F=FChrungssta?=\t =?iso-8859-1?Q?b?=", "FooBarFoo-AG \"ABCDEF\": Mit Digitalminister Hoffmeiser zum \"EU Sonder Gipfel\" in Wacken, 10. - 22.04.2026 - Sitzplatzvergabeverfahren für Führungsstab"},

};

TEST_HEADER();
Expand Down
Loading