diff --git a/crates/pe/src/bytes.rs b/crates/pe/src/bytes.rs index 971f36133..63aaeed12 100644 --- a/crates/pe/src/bytes.rs +++ b/crates/pe/src/bytes.rs @@ -1,37 +1,35 @@ -//! Checked little-endian reads over untrusted bytes. Every read returns `None` when out of range. +//! Bounds-checked little-endian field reads for the header parser: out of range is `None`. #[derive(Debug, Clone, Copy)] -pub(crate) struct Reader<'a> { - data: &'a [u8], -} +pub(crate) struct Reader<'a>(&'a [u8]); impl<'a> Reader<'a> { pub(crate) fn new(data: &'a [u8]) -> Self { - Reader { data } + Self(data) } + /// `len` bytes at `off`. pub(crate) fn slice(&self, off: usize, len: usize) -> Option<&'a [u8]> { - let end = off.checked_add(len)?; - self.data.get(off..end) + self.0.get(off..off.checked_add(len)?) + } + + fn field(&self, off: usize) -> Option<[u8; N]> { + self.0.get(off..)?.first_chunk::().copied() } pub(crate) fn u8(&self, off: usize) -> Option { - self.data.get(off).copied() - } - - fn arr(&self, off: usize) -> Option<[u8; N]> { - self.slice(off, N)?.try_into().ok() + self.field::<1>(off).map(|[b]| b) } pub(crate) fn u16_le(&self, off: usize) -> Option { - self.arr(off).map(u16::from_le_bytes) + Some(u16::from_le_bytes(self.field(off)?)) } pub(crate) fn u32_le(&self, off: usize) -> Option { - self.arr(off).map(u32::from_le_bytes) + Some(u32::from_le_bytes(self.field(off)?)) } pub(crate) fn u64_le(&self, off: usize) -> Option { - self.arr(off).map(u64::from_le_bytes) + Some(u64::from_le_bytes(self.field(off)?)) } }