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

Make dc_mimeparser_parse() return parser instead of modifying reference

Browse Source 
Since dc_mimeparser_parse() called `dc_mimeparser_empty()' on passed reference
anyway, it makes more sense to create new instance of `dc_mimeparser_t' and
return it instead.

Previously, usage pattern was following:

 dc_mimeparser_new()
 dc_mimeparser_empty() // semantically no-op, called inside dc_mimeparser_parse

Now call to dc_mimeparser_empty() is avoided.
This commit is contained in:
Dmitry Bogatov
2019-08-26 18:36:59 +00:00
committed by Floris Bruynooghe
parent 21976b14a6
commit 8e4a01c98d
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/dc_mimeparser.rs
View File

@@ -123,11 +123,12 @@ unsafe fn dc_mimepart_unref(mut mimepart: dc_mimepart_t) {
mimepart.msg_raw = 0 as *mut libc::c_char; mimepart.msg_raw = 0 as *mut libc::c_char;
} }
pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8]) { pub unsafe fn dc_mimeparser_parse<'a>(context: &'a Context, body: &[u8]) -> dc_mimeparser_t<'a> {
let r: libc::c_int; let r: libc::c_int;
let mut index: size_t = 0i32 as size_t; let mut index: size_t = 0i32 as size_t;
let optional_field: *mut mailimf_optional_field; let optional_field: *mut mailimf_optional_field;
dc_mimeparser_empty(mimeparser); let mut mimeparser = dc_mimeparser_new(context);
r = mailmime_parse( r = mailmime_parse(
body.as_ptr() as *const libc::c_char, body.as_ptr() as *const libc::c_char,
body.len(), body.len(),
@@ -140,15 +141,16 @@ pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8])
mimeparser.mimeroot, mimeparser.mimeroot,
&mut mimeparser.e2ee_helper, &mut mimeparser.e2ee_helper,
); );
dc_mimeparser_parse_mime_recursive(mimeparser, mimeparser.mimeroot); let mimeparser_ref = &mut mimeparser;
let field: *mut mailimf_field = dc_mimeparser_lookup_field(mimeparser, "Subject"); dc_mimeparser_parse_mime_recursive(mimeparser_ref, mimeparser_ref.mimeroot);
let field: *mut mailimf_field = dc_mimeparser_lookup_field(&mut mimeparser, "Subject");
if !field.is_null() && (*field).fld_type == MAILIMF_FIELD_SUBJECT as libc::c_int { if !field.is_null() && (*field).fld_type == MAILIMF_FIELD_SUBJECT as libc::c_int {
mimeparser.subject = dc_decode_header_words((*(*field).fld_data.fld_subject).sbj_value) mimeparser.subject = dc_decode_header_words((*(*field).fld_data.fld_subject).sbj_value)
} }
if !dc_mimeparser_lookup_optional_field(mimeparser, "Chat-Version").is_null() { if !dc_mimeparser_lookup_optional_field(&mut mimeparser, "Chat-Version").is_null() {
mimeparser.is_send_by_messenger = 1i32 mimeparser.is_send_by_messenger = 1i32
} }
if !dc_mimeparser_lookup_field(mimeparser, "Autocrypt-Setup-Message").is_null() { if !dc_mimeparser_lookup_field(&mut mimeparser, "Autocrypt-Setup-Message").is_null() {
let mut has_setup_file: libc::c_int = 0i32; let mut has_setup_file: libc::c_int = 0i32;
for part in &mimeparser.parts { for part in &mimeparser.parts {
if part.int_mimetype == 111i32 { if part.int_mimetype == 111i32 {
@@ -180,7 +182,7 @@ pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8])
} }
} }
} else { } else {
optional_field = dc_mimeparser_lookup_optional_field(mimeparser, "Chat-Content"); optional_field = dc_mimeparser_lookup_optional_field(&mut mimeparser, "Chat-Content");
if !optional_field.is_null() && !(*optional_field).fld_value.is_null() { if !optional_field.is_null() && !(*optional_field).fld_value.is_null() {
if strcmp( if strcmp(
(*optional_field).fld_value, (*optional_field).fld_value,
@@ -191,7 +193,7 @@ pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8])
} }
} }
} }
if !dc_mimeparser_lookup_field(mimeparser, "Chat-Group-Image").is_null() if !dc_mimeparser_lookup_field(&mut mimeparser, "Chat-Group-Image").is_null()
&& !mimeparser.parts.is_empty() && !mimeparser.parts.is_empty()
{ {
let textpart = &mimeparser.parts[0]; let textpart = &mimeparser.parts[0];
@@ -288,7 +290,7 @@ pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8])
} }
if mimeparser.parts.len() == 1 { if mimeparser.parts.len() == 1 {
if mimeparser.parts[0].type_0 == 40i32 { if mimeparser.parts[0].type_0 == 40i32 {
if !dc_mimeparser_lookup_optional_field(mimeparser, "Chat-Voice-Message").is_null() if !dc_mimeparser_lookup_optional_field(&mimeparser, "Chat-Voice-Message").is_null()
{ {
let part_mut = &mut mimeparser.parts[0]; let part_mut = &mut mimeparser.parts[0];
part_mut.type_0 = 41i32 part_mut.type_0 = 41i32
@@ -296,7 +298,7 @@ pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8])
} }
let part = &mimeparser.parts[0]; let part = &mimeparser.parts[0];
if part.type_0 == 40i32 || part.type_0 == 41i32 || part.type_0 == 50i32 { if part.type_0 == 40i32 || part.type_0 == 41i32 || part.type_0 == 50i32 {
let field_0 = dc_mimeparser_lookup_optional_field(mimeparser, "Chat-Duration"); let field_0 = dc_mimeparser_lookup_optional_field(&mimeparser, "Chat-Duration");
if !field_0.is_null() { if !field_0.is_null() {
let duration_ms: libc::c_int = dc_atoi_null_is_0((*field_0).fld_value); let duration_ms: libc::c_int = dc_atoi_null_is_0((*field_0).fld_value);
if duration_ms > 0i32 && duration_ms < 24i32 * 60i32 * 60i32 * 1000i32 { if duration_ms > 0i32 && duration_ms < 24i32 * 60i32 * 60i32 * 1000i32 {
@@ -307,9 +309,11 @@ pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8])
} }
} }
if 0 == mimeparser.decrypting_failed { if 0 == mimeparser.decrypting_failed {
let dn_field: *const mailimf_optional_field = let dn_field: *const mailimf_optional_field = dc_mimeparser_lookup_optional_field(
dc_mimeparser_lookup_optional_field(mimeparser, "Chat-Disposition-Notification-To"); &mimeparser,
if !dn_field.is_null() && dc_mimeparser_get_last_nonmeta(mimeparser).is_some() { "Chat-Disposition-Notification-To",
);
if !dn_field.is_null() && dc_mimeparser_get_last_nonmeta(&mut mimeparser).is_some() {
let mut mb_list: *mut mailimf_mailbox_list = 0 as *mut mailimf_mailbox_list; let mut mb_list: *mut mailimf_mailbox_list = 0 as *mut mailimf_mailbox_list;
let mut index_0: size_t = 0i32 as size_t; let mut index_0: size_t = 0i32 as size_t;
if mailimf_mailbox_list_parse( if mailimf_mailbox_list_parse(
@@ -323,7 +327,7 @@ pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8])
let dn_to_addr: *mut libc::c_char = mailimf_find_first_addr(mb_list); let dn_to_addr: *mut libc::c_char = mailimf_find_first_addr(mb_list);
if !dn_to_addr.is_null() { if !dn_to_addr.is_null() {
let from_field: *mut mailimf_field = let from_field: *mut mailimf_field =
dc_mimeparser_lookup_field(mimeparser, "From"); dc_mimeparser_lookup_field(&mimeparser, "From");
if !from_field.is_null() if !from_field.is_null()
&& (*from_field).fld_type == MAILIMF_FIELD_FROM as libc::c_int && (*from_field).fld_type == MAILIMF_FIELD_FROM as libc::c_int
&& !(*from_field).fld_data.fld_from.is_null() && !(*from_field).fld_data.fld_from.is_null()
@@ -333,7 +337,8 @@ pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8])
); );
if !from_addr.is_null() { if !from_addr.is_null() {
if strcmp(from_addr, dn_to_addr) == 0i32 { if strcmp(from_addr, dn_to_addr) == 0i32 {
if let Some(part_4) = dc_mimeparser_get_last_nonmeta(mimeparser) if let Some(part_4) =
dc_mimeparser_get_last_nonmeta(&mut mimeparser)
{ {
part_4.param.set_int(Param::WantsMdn, 1); part_4.param.set_int(Param::WantsMdn, 1);
} }
@@ -349,7 +354,7 @@ pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8])
} }
} }
/* Cleanup - and try to create at least an empty part if there are no parts yet */ /* Cleanup - and try to create at least an empty part if there are no parts yet */
if dc_mimeparser_get_last_nonmeta(mimeparser).is_none() && mimeparser.reports.is_empty() { if dc_mimeparser_get_last_nonmeta(&mut mimeparser).is_none() && mimeparser.reports.is_empty() {
let mut part_5 = dc_mimepart_new(); let mut part_5 = dc_mimepart_new();
part_5.type_0 = 10i32; part_5.type_0 = 10i32;
if !mimeparser.subject.is_null() && 0 == mimeparser.is_send_by_messenger { if !mimeparser.subject.is_null() && 0 == mimeparser.is_send_by_messenger {
@@ -359,6 +364,7 @@ pub unsafe fn dc_mimeparser_parse(mimeparser: &mut dc_mimeparser_t, body: &[u8])
} }
mimeparser.parts.push(part_5); mimeparser.parts.push(part_5);
}; };
mimeparser
} }
/******************************************************************************* /*******************************************************************************

3
src/dc_receive_imf.rs
View File

@@ -56,9 +56,8 @@ pub unsafe fn dc_receive_imf(
// we use mailmime_parse() through dc_mimeparser (both call mailimf_struct_multiple_parse() // we use mailmime_parse() through dc_mimeparser (both call mailimf_struct_multiple_parse()
// somewhen, I did not found out anything that speaks against this approach yet) // somewhen, I did not found out anything that speaks against this approach yet)
let mut mime_parser = dc_mimeparser_new(context);
let body = std::slice::from_raw_parts(imf_raw_not_terminated as *const u8, imf_raw_bytes); let body = std::slice::from_raw_parts(imf_raw_not_terminated as *const u8, imf_raw_bytes);
dc_mimeparser_parse(&mut mime_parser, body); let mut mime_parser = dc_mimeparser_parse(context, body);
if mime_parser.header.is_empty() { if mime_parser.header.is_empty() {
// Error - even adding an empty record won't help as we do not know the message ID // Error - even adding an empty record won't help as we do not know the message ID

4
tests/stress.rs
View File

@@ -657,11 +657,9 @@ unsafe fn create_test_context() -> TestContext {
fn test_dc_mimeparser_with_context() { fn test_dc_mimeparser_with_context() {
unsafe { unsafe {
let context = create_test_context(); let context = create_test_context();
let mut mimeparser = dc_mimeparser_new(&context.ctx);
let raw = b"Content-Type: multipart/mixed; boundary=\"==break==\";\nSubject: outer-subject\nX-Special-A: special-a\nFoo: Bar\nChat-Version: 0.0\n\n--==break==\nContent-Type: text/plain; protected-headers=\"v1\";\nSubject: inner-subject\nX-Special-B: special-b\nFoo: Xy\nChat-Version: 1.0\n\ntest1\n\n--==break==--\n\n\x00"; let raw = b"Content-Type: multipart/mixed; boundary=\"==break==\";\nSubject: outer-subject\nX-Special-A: special-a\nFoo: Bar\nChat-Version: 0.0\n\n--==break==\nContent-Type: text/plain; protected-headers=\"v1\";\nSubject: inner-subject\nX-Special-B: special-b\nFoo: Xy\nChat-Version: 1.0\n\ntest1\n\n--==break==--\n\n\x00";
let mut mimeparser = dc_mimeparser_parse(&context.ctx, &raw[..]);
dc_mimeparser_parse(&mut mimeparser, &raw[..]);
assert_eq!( assert_eq!(
as_str(mimeparser.subject as *const libc::c_char), as_str(mimeparser.subject as *const libc::c_char),
"inner-subject", "inner-subject",