Don't run destructors if Lua is gone

mlua-rs · Jul 2, 2024 · e3d138d · e3d138d
1 parent 617cf79
commit e3d138d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/lua.rs b/src/lua.rs
@@ -3377,10 +3377,16 @@ impl LuaInner {
 }
 
 impl WeakLua {
+    #[track_caller]
     #[inline(always)]
     pub(crate) fn lock(&self) -> LuaGuard {
         LuaGuard::new(self.0.upgrade().unwrap())
     }
+
+    #[inline(always)]
+    pub(crate) fn try_lock(&self) -> Option<LuaGuard> {
+        Some(LuaGuard::new(self.0.upgrade()?))
+    }
 }
 
 impl PartialEq for WeakLua {

diff --git a/src/types.rs b/src/types.rs
@@ -311,7 +311,9 @@ impl Clone for ValueRef {
 impl Drop for ValueRef {
     fn drop(&mut self) {
         if self.drop {
-            self.lua.lock().drop_ref(self);
+            if let Some(lua) = self.lua.try_lock() {
+                lua.drop_ref(self);
+            }
         }
     }
 }