Don't panic while already panicking in BoxSlot::drop

servo · May 18, 2020 · f4c4af2 · f4c4af2
1 parent 50bd5c3
commit f4c4af2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/components/layout_2020/dom_traversal.rs b/components/layout_2020/dom_traversal.rs
@@ -346,8 +346,10 @@ impl BoxSlot<'_> {
 
 impl Drop for BoxSlot<'_> {
     fn drop(&mut self) {
-        if let Some(slot) = &mut self.slot {
-            assert!(slot.borrow().is_some(), "failed to set a layout box");
+        if !std::thread::panicking() {
+            if let Some(slot) = &mut self.slot {
+                assert!(slot.borrow().is_some(), "failed to set a layout box");
+            }
         }
     }
 }