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

bring back memory leak

Browse Source
This commit is contained in:
dignifiedquire
2019-09-28 12:42:53 -06:00
parent e23704486a
commit 2ba25f9f77
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/e2ee.rs
View File

@@ -550,16 +550,15 @@ fn decrypt_if_autocrypt_message(
public_keyring_for_validate, public_keyring_for_validate,
ret_valid_signatures, ret_valid_signatures,
)?; )?;
/* decrypted_mime is a dangling pointer which we now put into // decrypted_mime is a dangling pointer which we now put into mailmime's Ownership
mailmime's Ownership */
unsafe { unsafe {
mailmime_substitute(mime, decrypted_mime); mailmime_substitute(mime, decrypted_mime);
mailmime_free(mime); mailmime_free(mime);
} }
/* finally, let's also return gossip headers // finally, let's also return gossip headers
XXX better return parsed headers so that upstream // XXX better return parsed headers so that upstream
does not need to dive into mmime-stuff again. */ // does not need to dive into mmime-stuff again.
unsafe { unsafe {
if (*ret_gossip_headers).is_null() && ret_valid_signatures.len() > 0 { if (*ret_gossip_headers).is_null() && ret_valid_signatures.len() > 0 {
let mut dummy: libc::size_t = 0; let mut dummy: libc::size_t = 0;
@@ -572,11 +571,12 @@ fn decrypt_if_autocrypt_message(
) == MAILIMF_NO_ERROR as libc::c_int ) == MAILIMF_NO_ERROR as libc::c_int
&& !test.is_null() && !test.is_null()
{ {
*ret_gossip_headers = test *ret_gossip_headers = test;
} }
} }
} }
return Ok(true);
Ok(true)
} }
fn decrypt_part( fn decrypt_part(
@@ -602,10 +602,10 @@ fn decrypt_part(
let (decoded_data, decoded_data_bytes) = let (decoded_data, decoded_data_bytes) =
wrapmime::decode_dt_data(mime_data, mime_transfer_encoding)?; wrapmime::decode_dt_data(mime_data, mime_transfer_encoding)?;
/* encrypted, non-NULL decoded data in decoded_data now ...
Note that we need to take care of freeing decoded_data ourself, // encrypted, non-NULL decoded data in decoded_data now ...
after encryption has been attempted. // Note that we need to take care of freeing decoded_data ourself,
*/ // after encryption has been attempted.
let mut ret_decrypted_mime = ptr::null_mut(); let mut ret_decrypted_mime = ptr::null_mut();
ensure!(!decoded_data.is_null(), "Missing data"); ensure!(!decoded_data.is_null(), "Missing data");
@@ -648,6 +648,10 @@ fn decrypt_part(
unsafe { mailmime_free(decrypted_mime) }; unsafe { mailmime_free(decrypted_mime) };
} }
} else { } else {
// decrypted_mime points into `plain`.
// FIXME(@dignifiedquire): this still leaks memory I believe, as mailmime_free
// does not free the underlying buffer. But for now we have to live with it
std::mem::forget(plain);
ret_decrypted_mime = decrypted_mime; ret_decrypted_mime = decrypted_mime;
} }
} }