This commit is contained in:
dignifiedquire
2019-08-07 23:13:14 +02:00
parent 7a3053e303
commit 3a60ada4c3

View File

@@ -1127,8 +1127,7 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
simplifier = Some(dc_simplify_t::new()); simplifier = Some(dc_simplify_t::new());
} }
/* get from `Content-Type: text/...; charset=utf-8`; must not be free()'d */ /* get from `Content-Type: text/...; charset=utf-8`; must not be free()'d */
let charset: *const libc::c_char = let charset = mailmime_content_charset_get((*mime).mm_content_type);
mailmime_content_charset_get((*mime).mm_content_type);
if !charset.is_null() if !charset.is_null()
&& strcmp(charset, b"utf-8\x00" as *const u8 as *const libc::c_char) && strcmp(charset, b"utf-8\x00" as *const u8 as *const libc::c_char)
!= 0i32 != 0i32
@@ -1173,13 +1172,14 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
8795901732489102124 => {} 8795901732489102124 => {}
_ => { _ => {
/* check header directly as is_send_by_messenger is not yet set up */ /* check header directly as is_send_by_messenger is not yet set up */
let is_msgrmsg: libc::c_int = (dc_mimeparser_lookup_optional_field( let is_msgrmsg = (!dc_mimeparser_lookup_optional_field(
&mimeparser, &mimeparser,
b"Chat-Version\x00" as *const u8 as *const libc::c_char, b"Chat-Version\x00" as *const u8 as *const libc::c_char,
) != 0 as *mut libc::c_void )
as *mut mailimf_optional_field) .is_null())
as libc::c_int; as libc::c_int;
if !decoded_data.is_null() && decoded_data_bytes > 0 {
info!( info!(
mimeparser.context, mimeparser.context,
0, 0,
@@ -1189,8 +1189,8 @@ unsafe fn dc_mimeparser_add_single_part_if_known(
decoded_data_bytes as usize, decoded_data_bytes as usize,
)) ))
); );
let simplified_txt: *mut libc::c_char = }
simplifier.unwrap().simplify( let simplified_txt = simplifier.unwrap().simplify(
decoded_data, decoded_data,
decoded_data_bytes as libc::c_int, decoded_data_bytes as libc::c_int,
if mime_type == 70i32 { 1i32 } else { 0i32 }, if mime_type == 70i32 { 1i32 } else { 0i32 },