cache: Attempt first steps at finding out more about #1

dermesser · Feb 16, 2020 · b2ce253 · b2ce253
1 parent a145fe2
commit b2ce253
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/cache.rs b/src/cache.rs
@@ -66,6 +66,9 @@ impl<T> LRUList<T> {
     }
 
     fn remove_last(&mut self) -> Option<T> {
+        if self.count() == 0 {
+            return None
+        }
         if self.head.prev.is_some() {
             let mut lasto = unsafe {
                 replace(
@@ -74,7 +77,10 @@ impl<T> LRUList<T> {
                 )
             };
 
+            assert!(lasto.is_some());
             if let Some(ref mut last) = lasto {
+                assert!(last.prev.is_some());
+                assert!(self.head.prev.is_some());
                 self.head.prev = last.prev;
                 self.count -= 1;
                 return replace(&mut (*last).data, None);