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

Closure shouldn't copy qr variable into it's own scope and we should

Browse Source 
never return null pointer
This commit is contained in:
jikstra
2019-09-02 17:05:31 +02:00
parent 77be6c4294
commit ff1e62a42d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dc_securejoin.rs
View File

@@ -49,7 +49,7 @@ pub unsafe fn dc_get_securejoin_qr(
} }
let self_addr = context.sql.get_config(context, "configured_addr"); let self_addr = context.sql.get_config(context, "configured_addr");
let cleanup = |fingerprint| { let cleanup = |fingerprint, qr: Option<String>| {
free(fingerprint as *mut libc::c_void); free(fingerprint as *mut libc::c_void);
free(invitenumber as *mut libc::c_void); free(invitenumber as *mut libc::c_void);
free(auth as *mut libc::c_void); free(auth as *mut libc::c_void);
@@ -57,13 +57,13 @@ pub unsafe fn dc_get_securejoin_qr(
if let Some(qr) = qr { if let Some(qr) = qr {
qr.strdup() qr.strdup()
} else { } else {
std::ptr::null_mut() "".strdup()
} }
}; };
if self_addr.is_none() { if self_addr.is_none() {
error!(context, 0, "Not configured, cannot generate QR code.",); error!(context, 0, "Not configured, cannot generate QR code.",);
return cleanup(fingerprint); return cleanup(fingerprint, qr);
} }
let self_addr = self_addr.unwrap(); let self_addr = self_addr.unwrap();
@@ -75,7 +75,7 @@ pub unsafe fn dc_get_securejoin_qr(
fingerprint = get_self_fingerprint(context); fingerprint = get_self_fingerprint(context);
if fingerprint.is_null() { if fingerprint.is_null() {
return cleanup(fingerprint); return cleanup(fingerprint, qr);
} }
let self_addr_urlencoded = utf8_percent_encode(&self_addr, NON_ALPHANUMERIC).to_string(); let self_addr_urlencoded = utf8_percent_encode(&self_addr, NON_ALPHANUMERIC).to_string();
@@ -101,7 +101,7 @@ pub unsafe fn dc_get_securejoin_qr(
context, context,
0, "Cannot get QR-code for chat-id {}", group_chat_id, 0, "Cannot get QR-code for chat-id {}", group_chat_id,
); );
return cleanup(fingerprint); return cleanup(fingerprint, None);
} }
} else { } else {
Some(format!( Some(format!(
@@ -116,7 +116,7 @@ pub unsafe fn dc_get_securejoin_qr(
info!(context, 0, "Generated QR code: {}", qr.as_ref().unwrap()); 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 { fn get_self_fingerprint(context: &Context) -> *mut libc::c_char {