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

Use safe version of `get_parent_mime_headers()' function

Browse Source
This commit is contained in:
Dmitry Bogatov
2019-09-06 23:09:52 +00:00
parent 3a57ba1142
commit aa5304a4f3
1 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/chat.rs
View File

@@ -294,9 +294,6 @@ impl<'a> Chat<'a> {
let mut do_guarantee_e2ee: libc::c_int; let mut do_guarantee_e2ee: libc::c_int;
let e2ee_enabled: libc::c_int; let e2ee_enabled: libc::c_int;
let mut OK_TO_CONTINUE = true; let mut OK_TO_CONTINUE = true;
let mut parent_rfc724_mid = ptr::null_mut();
let mut parent_references = ptr::null_mut();
let mut parent_in_reply_to = ptr::null_mut();
let mut new_rfc724_mid = ptr::null_mut(); let mut new_rfc724_mid = ptr::null_mut();
let mut new_references = ptr::null_mut(); let mut new_references = ptr::null_mut();
let mut new_in_reply_to = ptr::null_mut(); let mut new_in_reply_to = ptr::null_mut();
@@ -421,55 +418,58 @@ impl<'a> Chat<'a> {
msg.param.set_int(Param::GuranteeE2ee, 1); msg.param.set_int(Param::GuranteeE2ee, 1);
} }
msg.param.remove(Param::ErroneousE2ee); msg.param.remove(Param::ErroneousE2ee);
if !self.is_self_talk() if !self.is_self_talk() {
&& self if let Some((parent_rfc724_mid, parent_in_reply_to, parent_references)) =
.get_parent_mime_headers( self.get_parent_mime_headers_safe()
&mut parent_rfc724_mid,
&mut parent_in_reply_to,
&mut parent_references,
)
.is_ok()
{
if !parent_rfc724_mid.is_null()
&& 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int
{ {
new_in_reply_to = dc_strdup(parent_rfc724_mid) let parent_rfc724_mid = parent_rfc724_mid.strdup();
} let parent_in_reply_to = parent_in_reply_to.strdup();
if !parent_references.is_null() { let parent_references = parent_references.strdup();
let space: *mut libc::c_char;
space = strchr(parent_references, ' ' as i32); if !parent_rfc724_mid.is_null()
if !space.is_null() { && 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int
*space = 0 as libc::c_char {
new_in_reply_to = dc_strdup(parent_rfc724_mid)
} }
} if !parent_references.is_null() {
if !parent_references.is_null() let space: *mut libc::c_char;
&& 0 != *parent_references.offset(0isize) as libc::c_int space = strchr(parent_references, ' ' as i32);
&& !parent_rfc724_mid.is_null() if !space.is_null() {
&& 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int *space = 0 as libc::c_char
{ }
new_references = dc_mprintf( }
b"%s %s\x00" as *const u8 as *const libc::c_char, if !parent_references.is_null()
parent_references, && 0 != *parent_references.offset(0isize) as libc::c_int
parent_rfc724_mid, && !parent_rfc724_mid.is_null()
) && 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int
} else if !parent_references.is_null() {
&& 0 != *parent_references.offset(0isize) as libc::c_int new_references = dc_mprintf(
{ b"%s %s\x00" as *const u8 as *const libc::c_char,
new_references = dc_strdup(parent_references) parent_references,
} else if !parent_in_reply_to.is_null() parent_rfc724_mid,
&& 0 != *parent_in_reply_to.offset(0isize) as libc::c_int )
&& !parent_rfc724_mid.is_null() } else if !parent_references.is_null()
&& 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int && 0 != *parent_references.offset(0isize) as libc::c_int
{ {
new_references = dc_mprintf( new_references = dc_strdup(parent_references)
b"%s %s\x00" as *const u8 as *const libc::c_char, } else if !parent_in_reply_to.is_null()
parent_in_reply_to, && 0 != *parent_in_reply_to.offset(0isize) as libc::c_int
parent_rfc724_mid, && !parent_rfc724_mid.is_null()
) && 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int
} else if !parent_in_reply_to.is_null() {
&& 0 != *parent_in_reply_to.offset(0isize) as libc::c_int new_references = dc_mprintf(
{ b"%s %s\x00" as *const u8 as *const libc::c_char,
new_references = dc_strdup(parent_in_reply_to) parent_in_reply_to,
parent_rfc724_mid,
)
} else if !parent_in_reply_to.is_null()
&& 0 != *parent_in_reply_to.offset(0isize) as libc::c_int
{
new_references = dc_strdup(parent_in_reply_to)
}
free(parent_rfc724_mid as *mut libc::c_void);
free(parent_in_reply_to as *mut libc::c_void);
free(parent_references as *mut libc::c_void);
} }
} }
@@ -547,9 +547,6 @@ impl<'a> Chat<'a> {
} }
} }
free(parent_rfc724_mid as *mut libc::c_void);
free(parent_in_reply_to as *mut libc::c_void);
free(parent_references as *mut libc::c_void);
free(new_rfc724_mid as *mut libc::c_void); free(new_rfc724_mid as *mut libc::c_void);
free(new_in_reply_to as *mut libc::c_void); free(new_in_reply_to as *mut libc::c_void);
free(new_references as *mut libc::c_void); free(new_references as *mut libc::c_void);