bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix underflow in vec swap_remove

Browse source 
fixes #16200
This commit is contained in:
Alexis Beingessner 2014-08-02 14:36:51 -04:00
parent 032d5c1dcd
commit d9b2e6b74f
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libcollections/vec.rs
View file

@ -964,7 +964,7 @@ impl<T> Vec<T> {
#[inline] #[inline]
pub fn swap_remove(&mut self, index: uint) -> Option<T> { pub fn swap_remove(&mut self, index: uint) -> Option<T> {
let length = self.len(); let length = self.len();
if index < length - 1 { if length > 0 && index < length - 1 {
self.as_mut_slice().swap(index, length - 1); self.as_mut_slice().swap(index, length - 1);
} else if index >= length { } else if index >= length {
return None return None
@ -2003,6 +2003,12 @@ mod tests {
let _ = vec[3]; let _ = vec[3];
} }
#[test]
fn test_swap_remove_empty() {
let mut vec: Vec<uint> = vec!();
assert_eq!(vec.swap_remove(0), None);
}
#[bench] #[bench]
fn bench_new(b: &mut Bencher) { fn bench_new(b: &mut Bencher) {
b.iter(|| { b.iter(|| {