mirrors/alioth
1
0
Fork 0
mirror of https://github.com/google/alioth.git synced 2024-11-24 12:16:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(mem): return runtime error for zero-sized slot

Browse source 
Signed-off-by: Changyuan Lyu <changyuanl@google.com>
This commit is contained in:
Changyuan Lyu 2024-04-25 20:16:38 -07:00 committed by Lencerf
parent af08d15a96
commit 5dd03efbd7
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
alioth/src/mem.rs
View file

@ -75,6 +75,8 @@ pub enum Error {
NotAligned,
#[error("not backed by continuous host memory")]
NotContinuous,
#[error("adding a slot of size 0")]
ZeroSizedSlot,
}
pub type Result<T, E = Error> = std::result::Result<T, E>;

8
alioth/src/mem/addressable.rs
View file

@ -34,7 +34,9 @@ where
B: SlotBackend,
{
fn new(addr: usize, backend: B) -> Result<Self> {
debug_assert_ne!(backend.size(), 0);
if backend.size() == 0 {
return Err(Error::ZeroSizedSlot);
}
match (backend.size() - 1).checked_add(addr) {
None => Err(Error::OutOfRange {
addr,
@ -99,7 +101,6 @@ where
B: SlotBackend,
{
pub fn add(&mut self, addr: usize, backend: B) -> Result<&mut B> {
assert_ne!(backend.size(), 0);
let slot = Slot::new(addr, backend)?;
let result = match self.slots.binary_search_by_key(&addr, |s| s.addr) {
Ok(index) => Err(&self.slots[index]),
@ -169,7 +170,7 @@ mod test {
}
#[test]
fn test_overflow() {
fn test_new_slot() {
assert_matches!(
Slot::new(usize::MAX, Backend { size: 0x10 }),
Err(Error::OutOfRange {
@ -177,6 +178,7 @@ mod test {
addr: usize::MAX,
})
);
assert_matches!(Slot::new(0, Backend { size: 0 }), Err(Error::ZeroSizedSlot));
}
#[test]