diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index fa1291c61e1b..0259b547ab3f 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -547,7 +547,10 @@ fn indexable(&self) -> uint { fn idx(&self, index: uint) -> Option<&'self [T]> { if index < self.indexable() { let lo = index * self.size; - Some(self.v.slice(lo, cmp::min(lo, self.v.len() - self.size) + self.size)) + let mut hi = lo + self.size; + if hi < lo || hi > self.v.len() { hi = self.v.len(); } + + Some(self.v.slice(lo, hi)) } else { None }