RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 22:48:11 +00:00
Code Issues Activity Actions

Mail: Don't crash on invalid/missing From Email header

Browse source 
During testing, I found that some Email clients/providers format the
From header field content with a lower case f, so `from:` instead of
`From:`. Our client previously gave up if it couldn't find one that
starts with a capital F. Now, we try both, and provide a fallback if
neither were found.
This commit is contained in:
Valtteri Koskivuori 2023-07-25 21:11:54 +03:00 • committed by Andrew Kaster
parent 08fb98caac
commit bdecb0a999
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Applications/Mail/MailWidget.cpp
View file

@ -368,10 +368,17 @@ void MailWidget::selected_mailbox()
auto& from_iterator_value = from_iterator->get<1>().value();
auto from_index = from_iterator_value.find("From:"sv);
VERIFY(from_index.has_value());
auto potential_from = from_iterator_value.substring(from_index.value());
auto from_parts = potential_from.split_limit(':', 2);
auto from = parse_and_unfold(from_parts.last());
if (!from_index.has_value())
from_index = from_iterator_value.find("from:"sv);
DeprecatedString from;
if (from_index.has_value()) {
auto potential_from = from_iterator_value.substring(from_index.value());
auto from_parts = potential_from.split_limit(':', 2);
from = parse_and_unfold(from_parts.last());
}
if (from.is_empty())
from = "(Unknown sender)";
InboxEntry inbox_entry { from, subject };