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

fix FFI-behaviour: return default empty messages when asked for special ones

Browse Source
This commit is contained in:
holger krekel
2019-10-30 18:54:42 +01:00
parent 9cdfc3409d
commit b0ccbc36d9
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
deltachat-ffi/src/lib.rs
View File

@@ -1382,8 +1382,21 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
let message = match message::Message::load_from_db(ctx, MsgId::new(msg_id)) {
Ok(msg) => msg,
Err(e) => {
warn!(ctx, "Error getting msg #{}: {}", msg_id, e);
return ptr::null_mut();
if msg_id <= constants::DC_MSG_ID_LAST_SPECIAL {
// C-core API returns empty messages, do the same
warn!(
ctx,
"dc_get_msg called with special msg_id={}, returning empty msg",
msg_id
);
message::Message::default()
} else {
error!(
ctx,
"dc_get_msg could not retrieve msg_id {}: {}", msg_id, e
);
return ptr::null_mut();
}
}
};
let ffi_msg = MessageWrapper { context, message };