Merge pull request #4513 from EatThePath/cleanup-eval-stack

Clean up the lua stack after EvalStringWithReturn's function creation
2026-11-09 04:49:39 -10:00 · 2022-07-27 23:29:52 -04:00 · 2022-07-27 19:18:26 -05:00
2 changed files with 6 additions and 5 deletions
@@ -337,14 +337,20 @@ bool script_state::EvalStringWithReturn(const char* string, const char* format,
 				scripting::ade_get_args(LuaState, format, rtn);
 			}
 		} catch (const LuaException&) {
+			lua_pop(LuaState, 1);
+
 			return false;
 		}
 	} catch (const LuaException& e) {
 		LuaError(GetLuaSession(), "%s", e.what());

+		lua_pop(LuaState, 1);
+
 		return false;
 	}

+	lua_pop(LuaState, 1);
+
 	return true;
 }

@@ -1,5 +0,0 @@
-set(FSO_VERSION_MAJOR 22)
-set(FSO_VERSION_MINOR 2)
-set(FSO_VERSION_BUILD 0)
-set(FSO_VERSION_REVISION 0)
-set(FSO_VERSION_REVISION_STR RC8)
Author	SHA1	Message	Date
Goober5000	19ca467c41	Merge pull request #4513 from EatThePath/cleanup-eval-stack Clean up the lua stack after EvalStringWithReturn's function creation	2022-07-27 23:29:52 -04:00
David Gibson	73736280f9	Clean up the lua stack after EvalStringWithReturn's function creation	2022-07-27 19:18:26 -05:00