aya-obj: simplify using CStr::from_bytes_until_nul

main
Tamir Duberstein 21 hours ago committed by Michal R
parent d5e4e9270a
commit 658ae0fbb9

@ -5,7 +5,10 @@ use alloc::{
vec, vec,
vec::Vec, vec::Vec,
}; };
use core::{ffi::CStr, mem, ptr}; use core::{
ffi::{CStr, FromBytesUntilNulError},
mem, ptr,
};
use bytes::BufMut as _; use bytes::BufMut as _;
use log::debug; use log::debug;
@ -386,13 +389,9 @@ impl Btf {
} }
let offset = offset as usize; let offset = offset as usize;
let nul = self.strings[offset..]
.iter()
.position(|c| *c == 0u8)
.ok_or(BtfError::InvalidStringOffset { offset })?;
let s = CStr::from_bytes_with_nul(&self.strings[offset..=offset + nul]) let s = CStr::from_bytes_until_nul(&self.strings[offset..])
.map_err(|_| BtfError::InvalidStringOffset { offset })?; .map_err(|FromBytesUntilNulError { .. }| BtfError::InvalidStringOffset { offset })?;
Ok(s.to_string_lossy()) Ok(s.to_string_lossy())
} }

Loading…
Cancel
Save