From 8774a33914c6944f9ae58c161e8db2e8a39fed36 Mon Sep 17 00:00:00 2001 From: peelz Date: Thu, 15 Sep 2022 18:09:32 -0400 Subject: [PATCH] Fix possible NRE when stopping while a patched method is running --- Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index d473f6a9d..29ff74305 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -320,6 +320,10 @@ namespace Barotrauma public DynValue CallLuaFunction(object function, params object[] args) { + // XXX: `lua` might be null if `LuaCsSetup.Stop()` is called while + // a patched function is still running. + if (lua == null) return null; + lock (lua) { try