BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Clean up stack after script_get_backtrace (#7854)

Browse Source 
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.
This commit is contained in:
Michael Muller 2018-11-28 14:01:01 -05:00 committed by SmallJoker
parent faa358e797
commit ddd9317b73
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/common/c_internal.cpp
View File

@ -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)