Fix Lua stack size mismatch in l_space_spawn_cargo_near

Also add additional validation to LuaObjectBase::PushRegisterd() and LuaObjectBase::Allocate().
pioneerspacesim · Nov 3, 2024 · d472978 · d472978
1 parent 355781d
commit d472978
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/lua/LuaObject.cpp b/src/lua/LuaObject.cpp
@@ -450,6 +450,7 @@ bool LuaObjectBase::PushRegistered(LuaWrappable *o)
 
 	if (!o) {
 		lua_pushnil(l);
+		LUA_DEBUG_END(l, 1);
 		return true;
 	}
 
@@ -877,5 +878,10 @@ bool LuaObjectBase::DeserializeFromJson(lua_State *l, const Json &obj)
 void *LuaObjectBase::Allocate(size_t n)
 {
 	lua_State *l = Lua::manager->GetLuaState();
-	return lua_newuserdata(l, n);
+	LUA_DEBUG_START(l);
+
+	void *userdata = lua_newuserdata(l, n);
+
+	LUA_DEBUG_END(l, 1);
+	return userdata;
 }
diff --git a/src/lua/LuaSpace.cpp b/src/lua/LuaSpace.cpp
@@ -828,6 +828,8 @@ static int l_space_spawn_cargo_near(lua_State *l)
 	} else {
 		c_body = new CargoBody(model, LuaRef(l, 1));
 	}
+	lua_pop(l, 1); // pop model_name
+
 	Body *nearbody = LuaObject<Body>::CheckFromLua(2);
 	float min_dist = luaL_checknumber(l, 3);
 	float max_dist = luaL_checknumber(l, 4);