Skip to content
Permalink
Browse files

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.
  • Loading branch information...
mindhog authored and SmallJoker committed Nov 28, 2018
1 parent faa358e commit ddd9317b733857630499972179caebc236b4d991
Showing with 3 additions and 1 deletion.
  1. +3 −1 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)

0 comments on commit ddd9317

Please sign in to comment.
You can’t perform that action at this time.