Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-23 00:16:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

avoid unwrap() when falling back to latin1 charset

Browse Source
This commit is contained in:
B. Petersen
2020-12-04 11:42:14 +01:00
parent c6f6751c89
commit 0bdd1b7dc2
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mimeparser.rs
View File

@@ -1312,14 +1312,16 @@ fn get_attachment_filename(mail: &mailparse::ParsedMail) -> Result<Option<String
if charset.to_lowercase() == "utf-8" {
Some(decoded_bytes.decode_utf8_lossy().to_string())
} else {
let charset = match Charset::for_label(charset.as_bytes()) {
Some(c) => c,
// encoded_words crate say, latin-1 is not reported; moreover, latin1 is a good default
None => Charset::for_label(b"latin1").unwrap(),
};
let decoded_bytes = decoded_bytes.collect::<Vec<u8>>();
let (utf8_str, _, _) = charset.decode(&*decoded_bytes);
Some(utf8_str.into())
// encoded_words crate say, latin-1 is not reported; moreover, latin1 is a good default
if let Some(charset) = Charset::for_label(charset.as_bytes())
.or_else(|| Charset::for_label(b"latin1"))
{
let decoded_bytes = decoded_bytes.collect::<Vec<u8>>();
let (utf8_str, _, _) = charset.decode(&*decoded_bytes);
Some(utf8_str.into())
} else {
None
}
}
} else {
None