Skip to content

Commit

Permalink
properly null out ptr in LinkedList::split_off - fixes #26020
Browse files Browse the repository at this point in the history
  • Loading branch information
Gankra committed Jun 5, 2015
1 parent dd81d1e commit 43ceaa8
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions src/libcollections/linked_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,7 @@ impl<T> LinkedList<T> {
};

mem::swap(&mut split_node.resolve().unwrap().next, &mut splitted_list.list_head);
splitted_list.list_head.as_mut().unwrap().prev = Rawlink::none();
self.list_tail = split_node;
self.length = at;

Expand Down Expand Up @@ -1075,6 +1076,25 @@ mod tests {
}
}

#[test]
fn test_26021() {
// There was a bug in split_off that failed to null out the RHS's head's prev ptr.
// This caused the RHS's dtor to walk up into the LHS at drop and delete all of
// its nodes.
//
// https://github.com/rust-lang/rust/issues/26021
let mut v1 = LinkedList::new();
v1.push_front(1u8);
v1.push_front(1u8);
v1.push_front(1u8);
v1.push_front(1u8);
let _ = v1.split_off(3); // Dropping this now should not cause laundry consumption
assert_eq!(v1.len(), 3);

assert_eq!(v1.iter().len(), 3);
assert_eq!(v1.iter().collect::<Vec<_>>().len(), 3);
}

#[cfg(test)]
fn fuzz_test(sz: i32) {
let mut m: LinkedList<_> = LinkedList::new();
Expand Down

0 comments on commit 43ceaa8

Please sign in to comment.