Ensure that conc::Treiber::drop doesnt cause double-drop of the inner.

redox-os · Jun 29, 2017 · 0b15e8b · 0b15e8b
1 parent 6bd5bd5
commit 0b15e8b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/conc/src/sync/treiber.rs b/conc/src/sync/treiber.rs
@@ -23,13 +23,15 @@ impl<T> Drop for Treiber<T> {
         // structure. They're all gone, thus we can safely mess with the inner structure.
 
         unsafe {
-            let ptr = *self.head.get_inner_mut().get_mut();
+            let ptr = self.head.get_inner_mut().get_mut();
 
             if !ptr.is_null() {
                 // Call destructors on the stack.
-                (*ptr).destroy();
+                (**ptr).destroy();
                 // Finally deallocate the pointer itself.
-                drop(Box::from_raw(ptr));
+                drop(Box::from_raw(*ptr));
+                // Set it to null to prevent `Atomic`'s destructor from running.
+                *ptr = ptr::null_mut();
             }
         }
     }