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

fix: do not generate ptrs inside map

Browse Source
This commit is contained in:
dignifiedquire
2019-05-29 19:14:10 +02:00
parent 31daa425cf
commit c9c3ac3c23
3 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/dc_contact.rs
View File

@@ -848,13 +848,16 @@ pub unsafe fn dc_get_contact_encrinfo(
fingerprint_other_unverified,
);
} else {
let c_addr = peerstate.addr.as_ref().map(to_cstring);
let c_addr = peerstate.addr.as_ref().map(to_cstring).unwrap_or_default();
let addr_ptr = if peerstate.addr.is_some() {
c_addr.as_ptr()
} else {
std::ptr::null()
};
cat_fingerprint(
&mut ret,
c_addr
.map(|a| a.as_ptr())
.unwrap_or_else(|| std::ptr::null()),
addr_ptr,
fingerprint_other_verified,
fingerprint_other_unverified,
);