Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-20 06:56:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix closure in dc_securejoin, make sure we return an empty string and

Browse Source 
never null, make dc_get_securejoin_qr return an Option<String> and move
the logic to cast it to c_str into the ffi
This commit is contained in:
jikstra
2019-09-04 16:20:24 +02:00
committed by holger krekel
parent 8fb859c0c4
commit cc2339fbe2
3 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/dc_securejoin.rs
View File

@@ -25,12 +25,17 @@ use crate::x::*;
pub unsafe fn dc_get_securejoin_qr(
context: &Context,
group_chat_id: uint32_t,
) -> *mut libc::c_char {
) -> Option<String> {
/* =========================================================
==== Alice - the inviter side ====
==== Step 1 in "Setup verified contact" protocol ====
========================================================= */
let cleanup = |fingerprint, qr: Option<String>| {
free(fingerprint as *mut libc::c_void);
qr
};
let mut fingerprint = ptr::null_mut();
let mut qr: Option<String> = None;
@@ -53,19 +58,10 @@ pub unsafe fn dc_get_securejoin_qr(
});
let self_addr = context.sql.get_config(context, "configured_addr");
let cleanup = |fingerprint| {
free(fingerprint as *mut libc::c_void);
if let Some(qr) = qr {
qr.strdup()
} else {
std::ptr::null_mut()
}
};
if self_addr.is_none() {
error!(context, 0, "Not configured, cannot generate QR code.",);
return cleanup(fingerprint);
return cleanup(fingerprint, qr);
}
let self_addr = self_addr.unwrap();
@@ -77,7 +73,7 @@ pub unsafe fn dc_get_securejoin_qr(
fingerprint = get_self_fingerprint(context);
if fingerprint.is_null() {
return cleanup(fingerprint);
return cleanup(fingerprint, qr);
}
let self_addr_urlencoded = utf8_percent_encode(&self_addr, NON_ALPHANUMERIC).to_string();
@@ -103,7 +99,7 @@ pub unsafe fn dc_get_securejoin_qr(
context,
0, "Cannot get QR-code for chat-id {}", group_chat_id,
);
return cleanup(fingerprint);
return cleanup(fingerprint, qr);
}
} else {
Some(format!(
@@ -118,7 +114,7 @@ pub unsafe fn dc_get_securejoin_qr(
info!(context, 0, "Generated QR code: {}", qr.as_ref().unwrap());
cleanup(fingerprint)
cleanup(fingerprint, qr)
}
fn get_self_fingerprint(context: &Context) -> *mut libc::c_char {