From ddd9317b733857630499972179caebc236b4d991 Mon Sep 17 00:00:00 2001 From: Michael Muller Date: Wed, 28 Nov 2018 14:01:01 -0500 Subject: [PATCH] Clean up stack after script_get_backtrace (#7854) script_get_backtrace() was leaving its return value on the stack, corrupting subsequent lua operations for functions that did not immediately return. This problem can specifically be observed in the case of multiple "groupcaps" entries, each of which provides the legacy "maxwear" property. These cause a backtrace and thus pollute the stack for the following lua_next() call. --- src/script/common/c_internal.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp index be9691ef4..f792b6218 100644 --- a/src/script/common/c_internal.cpp +++ b/src/script/common/c_internal.cpp @@ -27,7 +27,9 @@ std::string script_get_backtrace(lua_State *L) { lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_BACKTRACE); lua_call(L, 0, 1); - return luaL_checkstring(L, -1); + std::string result = luaL_checkstring(L, -1); + lua_pop(L, 1); + return result; } int script_exception_wrapper(lua_State *L, lua_CFunction f) -- 2.25.1