linked-list: update current node when removing element

otherwise use after free
alexwei12 · Aug 4, 2019 · 86b7e6c · 86b7e6c
1 parent b9d3e0a
commit 86b7e6c
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/exercises/linked-list/example.rs b/exercises/linked-list/example.rs
@@ -216,10 +216,20 @@ impl<'a, T: 'a> Cursor<'a, T> {
         let prev = node.unlink_prev();
 
         match (prev, next) {
-            (Some(prev), Some(next)) => NodePtr::link(prev, next),
-            (Some(_), None) => self.list.head = prev,
-            (None, Some(_)) => self.list.tail = next,
+            (Some(prev), Some(next)) => {
+                self.node = Some(next);
+                NodePtr::link(prev, next);
+            },
+            (Some(_), None) => {
+                self.node = prev;
+                self.list.head = prev;
+            },
+            (None, Some(_)) => {
+                self.node = next;
+                self.list.tail = next;
+            },
             _ => {
+                self.node = None;
                 self.list.head = None;
                 self.list.tail = None;
             },