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

Merge pull request #705 from deltachat/safer-strn

Browse Source 
len-check in strncasecmp()
This commit is contained in:
björn petersen
2019-10-10 01:19:09 +02:00
committed by GitHub
parent e1fc5863c2 bc99d9d196
commit 4d79c6e235
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mmime/src/other.rs
View File

@@ -8,7 +8,7 @@ use crate::mailmime::types_helper::*;
pub(crate) use libc::{ pub(crate) use libc::{
calloc, close, free, isalpha, isdigit, malloc, memcmp, memcpy, memmove, memset, realloc, calloc, close, free, isalpha, isdigit, malloc, memcmp, memcpy, memmove, memset, realloc,
strcpy, strlen, strncmp, strncpy, strcpy, strlen, strncmp, strncpy, strnlen,
}; };
pub(crate) unsafe fn strcasecmp(s1: *const libc::c_char, s2: *const libc::c_char) -> libc::c_int { pub(crate) unsafe fn strcasecmp(s1: *const libc::c_char, s2: *const libc::c_char) -> libc::c_int {
@@ -40,8 +40,8 @@ pub(crate) unsafe fn strncasecmp(
// s1 and s2 might not be null terminated. // s1 and s2 might not be null terminated.
let s1_slice = std::slice::from_raw_parts(s1 as *const u8, n); let s1_slice = std::slice::from_raw_parts(s1 as *const u8, strnlen(s1 as *const i8, n));
let s2_slice = std::slice::from_raw_parts(s2 as *const u8, n); let s2_slice = std::slice::from_raw_parts(s2 as *const u8, strnlen(s2 as *const i8, n));
let s1 = std::ffi::CStr::from_bytes_with_nul_unchecked(s1_slice) let s1 = std::ffi::CStr::from_bytes_with_nul_unchecked(s1_slice)
.to_string_lossy() .to_string_lossy()
@@ -1693,6 +1693,14 @@ mod tests {
4, 4,
) )
}); });
assert_eq!(0, unsafe {
strncasecmp(
CString::new("hell").unwrap().as_ptr(),
CString::new("Hell").unwrap().as_ptr(),
100_000_000,
)
});
} }
#[test] #[test]