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

Fix crash in log_deprecated when triggered from no function

Browse Source 
Based on commit a1598e1b
This commit is contained in:
SmallJoker 2018-05-14 21:03:48 +02:00 committed by sfan5
parent 119aa5c919
commit 2515207606
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

@ -181,7 +181,9 @@ void log_deprecated(lua_State *L, const std::string &message)
warningstream << message; warningstream << message;
if (L) { // L can be NULL if we get called from scripting_game.cpp if (L) { // L can be NULL if we get called from scripting_game.cpp
lua_Debug ar; lua_Debug ar;
FATAL_ERROR_IF(!lua_getstack(L, 2, &ar), "lua_getstack() failed");
if (!lua_getstack(L, 2, &ar))
FATAL_ERROR_IF(!lua_getstack(L, 1, &ar), "lua_getstack() failed");
FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed"); FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed");
warningstream << " (at " << ar.short_src << ":" << ar.currentline << ")"; warningstream << " (at " << ar.short_src << ":" << ar.currentline << ")";
} }