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

Merge pull request #255 from link2xt/dc_open-safer

Browse Source 
Make dc_open arguments rusty
This commit is contained in:
Friedel Ziegelmayer
2019-07-30 00:21:03 +02:00
committed by GitHub
parent 2c66837df4 2d5b04148f
commit 7ba1a6f79f
8 changed files with 41 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/stress.rs
View File

@@ -817,14 +817,12 @@ struct TestContext {
unsafe fn create_test_context() -> TestContext {
let mut ctx = dc_context_new(Some(cb), std::ptr::null_mut(), std::ptr::null_mut());
let dir = tempdir().unwrap();
let dbfile = to_cstring(dir.path().join("db.sqlite").to_str().unwrap());
assert_eq!(
dc_open(&mut ctx, dbfile, std::ptr::null()),
1,
let dbfile = dir.path().join("db.sqlite");
assert!(
dc_open(&mut ctx, dbfile.to_str().unwrap(), None),
"Failed to open {}",
as_str(dbfile as *const libc::c_char)
dbfile.to_str().unwrap()
);
free(dbfile as *mut _);
TestContext { ctx: ctx, dir: dir }
}
@@ -1006,9 +1004,7 @@ fn test_wrong_db() {
let dbfile = dir.path().join("db.sqlite");
std::fs::write(&dbfile, b"123").unwrap();
let dbfile_c = to_cstring(dbfile.to_str().unwrap());
let res = dc_open(&mut ctx, dbfile_c, std::ptr::null());
free(dbfile_c as *mut _);
assert_eq!(res, 0);
let res = dc_open(&mut ctx, dbfile.to_str().unwrap(), None);
assert!(!res);
}
}