Skip to content

Use from_bytes_with_nul for string check #583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
Aug 20, 2021
Merged

Use from_bytes_with_nul for string check #583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions cpufeatures/src/aarch64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,18 +125,13 @@ macro_rules! check {
/// macOS helper function for calling `sysctlbyname`.
#[cfg(target_os = "macos")]
pub unsafe fn sysctlbyname(name: &[u8]) -> bool {
assert_eq!(
name.last().cloned(),
Some(0),
"name is not NUL terminated: {:?}",
name
);
let name = core::ffi::CStr::from_bytes_with_nul(name).unwrap();

let mut value: u32 = 0;
let mut size = core::mem::size_of::<u32>();

let rc = libc::sysctlbyname(
name.as_ptr() as *const i8,
name.as_ptr(),
&mut value as *mut _ as *mut libc::c_void,
&mut size,
core::ptr::null_mut(),
Expand Down