Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-17 05:46:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

prefer to_opt_string_lossy() over as_opt_str() as the latter pancis on non-wellformatted utf-8, delete as_opt_str()

Browse Source
This commit is contained in:
B. Petersen
2019-10-31 18:26:39 +01:00
committed by holger krekel
parent e4b3e23769
commit 858baf0c2c
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/dc_mimeparser.rs
View File

@@ -127,8 +127,12 @@ impl<'a> MimeParser<'a> {
if let Some(field) = self.lookup_field("Subject") { if let Some(field) = self.lookup_field("Subject") {
if (*field).fld_type == MAILIMF_FIELD_SUBJECT as libc::c_int { if (*field).fld_type == MAILIMF_FIELD_SUBJECT as libc::c_int {
let subj = (*(*field).fld_data.fld_subject).sbj_value; let subj = (*(*field).fld_data.fld_subject).sbj_value;
let subj = to_opt_string_lossy(subj);
self.subject = as_opt_str(subj).map(dc_decode_header_words); self.subject = if subj.is_some() {
Some(dc_decode_header_words(&subj.unwrap()))
} else {
None
};
} }
} }
@@ -992,15 +996,16 @@ unsafe fn mailmime_get_mime_type(mime: *mut Mailmime) -> (libc::c_int, Viewtype,
} }
} }
let raw_mime = reconcat_mime(Some("text"), as_opt_str((*c).ct_subtype)); let raw_mime = reconcat_mime(Some("text"), to_opt_string_lossy((*c).ct_subtype));
(DC_MIMETYPE_FILE, Viewtype::File, Some(raw_mime)) (DC_MIMETYPE_FILE, Viewtype::File, Some(raw_mime))
} }
MAILMIME_DISCRETE_TYPE_IMAGE => { MAILMIME_DISCRETE_TYPE_IMAGE => {
let subtype = as_opt_str((*c).ct_subtype); let subtype = to_opt_string_lossy((*c).ct_subtype);
let msg_type = match subtype { let msg_type = match subtype.as_ref().map(|x| x.as_str()) {
Some("gif") => Viewtype::Gif, Some("gif") => Viewtype::Gif,
Some("svg+xml") => { Some("svg+xml") => {
let raw_mime = reconcat_mime(Some("image"), as_opt_str((*c).ct_subtype)); let raw_mime =
reconcat_mime(Some("image"), to_opt_string_lossy((*c).ct_subtype));
return (DC_MIMETYPE_FILE, Viewtype::File, Some(raw_mime)); return (DC_MIMETYPE_FILE, Viewtype::File, Some(raw_mime));
} }
_ => Viewtype::Image, _ => Viewtype::Image,
@@ -1010,11 +1015,11 @@ unsafe fn mailmime_get_mime_type(mime: *mut Mailmime) -> (libc::c_int, Viewtype,
(DC_MIMETYPE_IMAGE, msg_type, Some(raw_mime)) (DC_MIMETYPE_IMAGE, msg_type, Some(raw_mime))
} }
MAILMIME_DISCRETE_TYPE_AUDIO => { MAILMIME_DISCRETE_TYPE_AUDIO => {
let raw_mime = reconcat_mime(Some("audio"), as_opt_str((*c).ct_subtype)); let raw_mime = reconcat_mime(Some("audio"), to_opt_string_lossy((*c).ct_subtype));
(DC_MIMETYPE_AUDIO, Viewtype::Audio, Some(raw_mime)) (DC_MIMETYPE_AUDIO, Viewtype::Audio, Some(raw_mime))
} }
MAILMIME_DISCRETE_TYPE_VIDEO => { MAILMIME_DISCRETE_TYPE_VIDEO => {
let raw_mime = reconcat_mime(Some("video"), as_opt_str((*c).ct_subtype)); let raw_mime = reconcat_mime(Some("video"), to_opt_string_lossy((*c).ct_subtype));
(DC_MIMETYPE_VIDEO, Viewtype::Video, Some(raw_mime)) (DC_MIMETYPE_VIDEO, Viewtype::Video, Some(raw_mime))
} }
_ => { _ => {
@@ -1025,13 +1030,15 @@ unsafe fn mailmime_get_mime_type(mime: *mut Mailmime) -> (libc::c_int, Viewtype,
b"autocrypt-setup\x00" as *const u8 as *const libc::c_char, b"autocrypt-setup\x00" as *const u8 as *const libc::c_char,
) == 0i32 ) == 0i32
{ {
let raw_mime = reconcat_mime(None, as_opt_str((*c).ct_subtype)); let raw_mime = reconcat_mime(None, to_opt_string_lossy((*c).ct_subtype));
return (DC_MIMETYPE_AC_SETUP_FILE, Viewtype::File, Some(raw_mime)); return (DC_MIMETYPE_AC_SETUP_FILE, Viewtype::File, Some(raw_mime));
} }
let raw_mime = reconcat_mime( let raw_mime = reconcat_mime(
as_opt_str((*(*(*c).ct_type).tp_data.tp_discrete_type).dt_extension), to_opt_string_lossy((*(*(*c).ct_type).tp_data.tp_discrete_type).dt_extension)
as_opt_str((*c).ct_subtype), .as_ref()
.map(|x| x.as_str()),
to_opt_string_lossy((*c).ct_subtype),
); );
(DC_MIMETYPE_FILE, Viewtype::File, Some(raw_mime)) (DC_MIMETYPE_FILE, Viewtype::File, Some(raw_mime))
@@ -1041,9 +1048,9 @@ unsafe fn mailmime_get_mime_type(mime: *mut Mailmime) -> (libc::c_int, Viewtype,
if (*(*(*c).ct_type).tp_data.tp_composite_type).ct_type if (*(*(*c).ct_type).tp_data.tp_composite_type).ct_type
== MAILMIME_COMPOSITE_TYPE_MULTIPART as libc::c_int == MAILMIME_COMPOSITE_TYPE_MULTIPART as libc::c_int
{ {
let subtype = as_opt_str((*c).ct_subtype); let subtype = to_opt_string_lossy((*c).ct_subtype);
let mime_type = match subtype { let mime_type = match subtype.as_ref().map(|x| x.as_str()) {
Some("alternative") => DC_MIMETYPE_MP_ALTERNATIVE, Some("alternative") => DC_MIMETYPE_MP_ALTERNATIVE,
Some("related") => DC_MIMETYPE_MP_RELATED, Some("related") => DC_MIMETYPE_MP_RELATED,
Some("encrypted") => { Some("encrypted") => {
@@ -1078,9 +1085,9 @@ unsafe fn mailmime_get_mime_type(mime: *mut Mailmime) -> (libc::c_int, Viewtype,
} }
} }
fn reconcat_mime(typ: Option<&str>, subtype: Option<&str>) -> String { fn reconcat_mime(typ: Option<&str>, subtype: Option<String>) -> String {
let typ = typ.unwrap_or("application"); let typ = typ.unwrap_or("application");
let subtype = subtype.unwrap_or("octet-stream"); let subtype = subtype.unwrap_or("octet-stream".to_string());
format!("{}/{}", typ, subtype) format!("{}/{}", typ, subtype)
} }

8
src/dc_tools.rs
View File

@@ -713,14 +713,6 @@ pub fn as_str<'a>(s: *const libc::c_char) -> &'a str {
as_str_safe(s).unwrap_or_else(|err| panic!("{}", err)) as_str_safe(s).unwrap_or_else(|err| panic!("{}", err))
} }
/// Converts a C string to either a Rust `&str` or `None` if it is a null pointer.
pub fn as_opt_str<'a>(s: *const libc::c_char) -> Option<&'a str> {
if s.is_null() {
return None;
}
Some(as_str(s))
}
fn as_str_safe<'a>(s: *const libc::c_char) -> Result<&'a str, Error> { fn as_str_safe<'a>(s: *const libc::c_char) -> Result<&'a str, Error> {
assert!(!s.is_null(), "cannot be used on null pointers"); assert!(!s.is_null(), "cannot be used on null pointers");