File tree 1 file changed +26
-0
lines changed 1 file changed +26
-0
lines changed Original file line number Diff line number Diff line change @@ -616,7 +616,13 @@ impl<T> LinkedList<T> {
616
616
length : len - at
617
617
} ;
618
618
619
+ // Swap split_node.next with list_head (which is None), nulling out split_node.next,
620
+ // as it is the new tail.
619
621
mem:: swap ( & mut split_node. resolve ( ) . unwrap ( ) . next , & mut splitted_list. list_head ) ;
622
+ // Null out list_head.prev. Note this `unwrap` won't fail because if at == len
623
+ // we already branched out at the top of the fn to return the empty list.
624
+ splitted_list. list_head . as_mut ( ) . unwrap ( ) . prev = Rawlink :: none ( ) ;
625
+ // Fix the tail ptr
620
626
self . list_tail = split_node;
621
627
self . length = at;
622
628
@@ -1082,6 +1088,26 @@ mod tests {
1082
1088
}
1083
1089
}
1084
1090
1091
+ #[ test]
1092
+ fn test_26021 ( ) {
1093
+ use std:: iter:: ExactSizeIterator ;
1094
+ // There was a bug in split_off that failed to null out the RHS's head's prev ptr.
1095
+ // This caused the RHS's dtor to walk up into the LHS at drop and delete all of
1096
+ // its nodes.
1097
+ //
1098
+ // https://github.com/rust-lang/rust/issues/26021
1099
+ let mut v1 = LinkedList :: new ( ) ;
1100
+ v1. push_front ( 1u8 ) ;
1101
+ v1. push_front ( 1u8 ) ;
1102
+ v1. push_front ( 1u8 ) ;
1103
+ v1. push_front ( 1u8 ) ;
1104
+ let _ = v1. split_off ( 3 ) ; // Dropping this now should not cause laundry consumption
1105
+ assert_eq ! ( v1. len( ) , 3 ) ;
1106
+
1107
+ assert_eq ! ( v1. iter( ) . len( ) , 3 ) ;
1108
+ assert_eq ! ( v1. iter( ) . collect:: <Vec <_>>( ) . len( ) , 3 ) ;
1109
+ }
1110
+
1085
1111
#[ cfg( test) ]
1086
1112
fn fuzz_test ( sz : i32 ) {
1087
1113
let mut m: LinkedList < _ > = LinkedList :: new ( ) ;
You can’t perform that action at this time.
0 commit comments