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

dc_location: store marker as Option<String> instead of C string

Browse Source
This commit is contained in:
Alexander Krotov
2019-07-25 14:26:33 +03:00
committed by Floris Bruynooghe
parent ec6cc5c355
commit 9f75a5049e
2 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dc_array.rs
View File

@@ -42,13 +42,7 @@ pub unsafe fn dc_array_free_ptr(array: *mut dc_array_t) {
}
let mut i: size_t = 0i32 as size_t;
while i < (*array).count {
if (*array).type_0 == 1i32 {
free(
(*(*(*array).array.offset(i as isize) as *mut dc_location)).marker
as *mut libc::c_void,
);
}
free(*(*array).array.offset(i as isize) as *mut libc::c_void);
Box::from_raw(*(*array).array.offset(i as isize) as *mut dc_location);
*(*array).array.offset(i as isize) = 0i32 as uintptr_t;
i = i.wrapping_add(1)
}
@@ -203,7 +197,11 @@ pub unsafe fn dc_array_get_marker(array: *const dc_array_t, index: size_t) -> *m
{
return 0 as *mut libc::c_char;
}
dc_strdup_keep_null((*(*(*array).array.offset(index as isize) as *mut dc_location)).marker)
if let Some(s) = &(*(*(*array).array.offset(index as isize) as *mut dc_location)).marker {
to_cstring(s)
} else {
std::ptr::null_mut()
}
}
/**