lua: fix memory leak causing crash after a few dozen script loads/resets

TASEmulators · May 10, 2017 · 8bc067c · 8bc067c
1 parent e098546
commit 8bc067c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/BizHawk.Client.Common/lua/LuaFile.cs b/BizHawk.Client.Common/lua/LuaFile.cs
@@ -49,6 +49,7 @@ public enum RunState
 		public void Stop()
 		{
 			State = RunState.Disabled;
+			Thread.GetTable("keepalives")[Thread] = null;
 			Thread = null;
 		}
 

diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
@@ -23,6 +23,7 @@ public class EmuLuaLibrary
 		public EmuLuaLibrary()
 		{
 			Docs = new LuaDocumentation();
+			_lua["keepalives"] = _lua.NewTable();
 		}
 
 		private FormsLuaLibrary FormsLibrary
@@ -172,14 +173,16 @@ public Lua SpawnCoroutine(string file)
 			var content = File.ReadAllText(file);
 			var main = lua.LoadString(content, "main");
 			lua.Push(main); // push main function on to stack for subsequent resuming
+			_lua.GetTable("keepalives")[lua] = 1;
+			_lua.Pop();
 			return lua;
 		}
 
 		public void ExecuteString(string command)
 		{
 			_currThread = _lua.NewThread();
-
 			_currThread.DoString(command);
+			_lua.Pop();
 		}
 
 		public ResumeResult ResumeScript(Lua script)