TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-22 16:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix copy_cstr

Browse Source
This commit is contained in:
topjohnwu 2023-06-15 04:00:32 -07:00
parent d3e1c496ca
commit 037f46f7f0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
native/src/base/misc.rs
View File

@ -21,7 +21,7 @@ pub fn copy_cstr<T: AsRef<CStr> + ?Sized>(dest: &mut [u8], src: &T) -> usize {
let src = src.as_ref().to_bytes_with_nul(); let src = src.as_ref().to_bytes_with_nul();
let len = min(src.len(), dest.len()); let len = min(src.len(), dest.len());
dest[..len].copy_from_slice(&src[..len]); dest[..len].copy_from_slice(&src[..len]);
len len - 1
} }
struct BufFmtWriter<'a> { struct BufFmtWriter<'a> {
@ -68,7 +68,7 @@ macro_rules! bfmt {
macro_rules! bfmt_cstr { macro_rules! bfmt_cstr {
($buf:expr, $($args:tt)*) => {{ ($buf:expr, $($args:tt)*) => {{
let len = $crate::fmt_to_buf($buf, format_args!($($args)*)); let len = $crate::fmt_to_buf($buf, format_args!($($args)*));
#[allow(unused_unsafe)] #[allow(unused_unsafe, clippy::unnecessary_mut_passed)]
unsafe { unsafe {
$crate::Utf8CStr::from_bytes_unchecked($buf.get_unchecked(..(len + 1))) $crate::Utf8CStr::from_bytes_unchecked($buf.get_unchecked(..(len + 1)))
} }