Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions vm/src/sliceable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -308,14 +308,15 @@ impl SequenceIndexOp for isize {
}

fn wrapped_at(&self, len: usize) -> Option<usize> {
let neg = self.is_negative();
let p = self.unsigned_abs();
if neg {
len.checked_sub(p)
} else if p >= len {
let mut p = *self;
if p < 0 {
// casting to isize is ok because it is used by wrapping_add
p = p.wrapping_add(len as isize);
}
if p < 0 || (p as usize) >= len {
None
} else {
Some(p)
Some(p as usize)
}
}
}
Expand Down