Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 12:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

systematically ignore invalid message ids when passed in through CFFI

Browse Source
This commit is contained in:
holger krekel
2019-10-30 17:19:37 +01:00
parent fc851f542a
commit 9cdfc3409d
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1280,8 +1280,7 @@ pub unsafe extern "C" fn dc_delete_msgs(
return; return;
} }
let ffi_context = &*context; let ffi_context = &*context;
let ids = std::slice::from_raw_parts(msg_ids, msg_cnt as usize); let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
let msg_ids: Vec<MsgId> = ids.iter().map(|id| MsgId::new(*id)).collect();
ffi_context ffi_context
.with_inner(|ctx| message::delete_msgs(ctx, &msg_ids[..])) .with_inner(|ctx| message::delete_msgs(ctx, &msg_ids[..]))
.unwrap_or(()) .unwrap_or(())
@@ -1314,8 +1313,7 @@ pub unsafe extern "C" fn dc_forward_msgs(
eprintln!("ignoring careless call to dc_forward_msgs()"); eprintln!("ignoring careless call to dc_forward_msgs()");
return; return;
} }
let ids = std::slice::from_raw_parts(msg_ids, msg_cnt as usize); let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
let msg_ids: Vec<MsgId> = ids.iter().map(|id| MsgId::new(*id)).collect();
let ffi_context = &*context; let ffi_context = &*context;
ffi_context ffi_context
.with_inner(|ctx| { .with_inner(|ctx| {
@@ -1347,12 +1345,7 @@ pub unsafe extern "C" fn dc_markseen_msgs(
eprintln!("ignoring careless call to dc_markseen_msgs()"); eprintln!("ignoring careless call to dc_markseen_msgs()");
return; return;
} }
let ids = std::slice::from_raw_parts(msg_ids, msg_cnt as usize); let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
let msg_ids: Vec<MsgId> = ids
.iter()
.filter(|id| **id > DC_MSG_ID_LAST_SPECIAL)
.map(|id| MsgId::new(*id))
.collect();
let ffi_context = &*context; let ffi_context = &*context;
ffi_context ffi_context
.with_inner(|ctx| message::markseen_msgs(ctx, &msg_ids[..])) .with_inner(|ctx| message::markseen_msgs(ctx, &msg_ids[..]))
@@ -1370,8 +1363,7 @@ pub unsafe extern "C" fn dc_star_msgs(
eprintln!("ignoring careless call to dc_star_msgs()"); eprintln!("ignoring careless call to dc_star_msgs()");
return; return;
} }
let ids = std::slice::from_raw_parts(msg_ids, msg_cnt as usize); let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
let msg_ids: Vec<MsgId> = ids.iter().map(|id| MsgId::new(*id)).collect();
let ffi_context = &*context; let ffi_context = &*context;
ffi_context ffi_context
.with_inner(|ctx| message::star_msgs(ctx, &msg_ids[..], star == 1)) .with_inner(|ctx| message::star_msgs(ctx, &msg_ids[..], star == 1))
@@ -1390,7 +1382,7 @@ 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)) { let message = match message::Message::load_from_db(ctx, MsgId::new(msg_id)) {
Ok(msg) => msg, Ok(msg) => msg,
Err(e) => { Err(e) => {
error!(ctx, "Error getting msg #{}: {}", msg_id, e); warn!(ctx, "Error getting msg #{}: {}", msg_id, e);
return ptr::null_mut(); return ptr::null_mut();
} }
}; };
@@ -3019,3 +3011,15 @@ impl<T, E> ResultNullableExt<T> for Result<T, E> {
} }
} }
} }
fn convert_and_prune_message_ids(msg_ids: *const u32, msg_cnt: libc::c_int) -> Vec<MsgId> {
let ids = unsafe { std::slice::from_raw_parts(msg_ids, msg_cnt as usize) };
let msg_ids: Vec<MsgId> = ids
.iter()
.filter(|id| **id > DC_MSG_ID_LAST_SPECIAL)
.map(|id| MsgId::new(*id))
.collect();
msg_ids
}