alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

message: ensure message text is valid utf8

Browse Source 
Seems this is not guaranteed, so convert if needed.
This commit is contained in:
Dirk-Jan C. Binnema
2025-10-25 16:55:02 +03:00
committed by Seth Ladygo
parent 5c6642c9b9
commit 976b6210fc
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/message/mu-message.cc
View File

@ -374,10 +374,15 @@ get_mailing_list(const MimeMessage& mime_msg)
static void static void
append_text(Option<std::string>& str, Option<std::string>&& app) append_text(Option<std::string>& str, Option<std::string>&& app)
{ {
/*
* it is not guaranteed that what we get here is valid utf8,
* so we enforce it with utf8_clean
*/
if (!str && app) if (!str && app)
str = std::move(*app); str = utf8_clean(std::move(*app));
else if (str && app) else if (str && app)
str.value() += app.value(); str.value() += utf8_clean(app.value());
} }
static void static void