Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: safer string conversions

Browse Source
This commit is contained in:
dignifiedquire
2019-07-12 22:50:56 +02:00
parent 8714599655
commit d19d3985e8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dc_chat.rs
View File

@@ -683,8 +683,8 @@ unsafe fn prepare_msg_raw(
if !(*msg).text.is_null() { Some(as_str((*msg).text)) } else { None }, if !(*msg).text.is_null() { Some(as_str((*msg).text)) } else { None },
if (*(*msg).param).packed.is_null() { None } else { Some(as_str((*(*msg).param).packed)) }, if (*(*msg).param).packed.is_null() { None } else { Some(as_str((*(*msg).param).packed)) },
(*msg).hidden, (*msg).hidden,
as_str(new_in_reply_to), to_string(new_in_reply_to),
as_str(new_references), to_string(new_references),
location_id as i32, location_id as i32,
] ]
) { ) {
@@ -821,7 +821,7 @@ pub unsafe fn dc_chat_update_param(chat: *mut Chat) -> libc::c_int {
(*chat).context, (*chat).context,
&(*chat).context.sql, &(*chat).context.sql,
"UPDATE chats SET param=? WHERE id=?", "UPDATE chats SET param=? WHERE id=?",
params![as_str((*(*chat).param).packed), (*chat).id as i32], params![to_string((*(*chat).param).packed), (*chat).id as i32],
) as libc::c_int ) as libc::c_int
} }
@@ -991,7 +991,7 @@ unsafe fn set_draft_raw(context: &Context, chat_id: uint32_t, msg: *mut dc_msg_t
} else { } else {
"" ""
}, },
as_str((*(*msg).param).packed), to_string((*(*msg).param).packed),
1, 1,
] ]
) { ) {