srifqi/minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Lua panic when error() message is not a string

Browse Source
This commit is contained in:
Paul Ouellette 2020-06-06 14:52:26 -04:00 committed by sfan5
parent fe1f72ab0a
commit 09f9e465e7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/script/cpp_api/s_base.cpp
View File

@ -187,7 +187,9 @@ void ScriptApiBase::loadScript(const std::string &script_path)
} }
ok = ok && !lua_pcall(L, 0, 0, error_handler); ok = ok && !lua_pcall(L, 0, 0, error_handler);
if (!ok) { if (!ok) {
std::string error_msg = readParam<std::string>(L, -1); const char *error_msg = lua_tostring(L, -1);
if (!error_msg)
error_msg = "(error object is not a string)";
lua_pop(L, 2); // Pop error message and error handler lua_pop(L, 2); // Pop error message and error handler
throw ModError("Failed to load and run script from " + throw ModError("Failed to load and run script from " +
script_path + ":\n" + error_msg); script_path + ":\n" + error_msg);
@ -219,7 +221,9 @@ void ScriptApiBase::loadModFromMemory(const std::string &mod_name)
if (ok) if (ok)
ok = !lua_pcall(L, 0, 0, error_handler); ok = !lua_pcall(L, 0, 0, error_handler);
if (!ok) { if (!ok) {
std::string error_msg = luaL_checkstring(L, -1); const char *error_msg = lua_tostring(L, -1);
if (!error_msg)
error_msg = "(error object is not a string)";
lua_pop(L, 2); // Pop error message and error handler lua_pop(L, 2); // Pop error message and error handler
throw ModError("Failed to load and run mod \"" + throw ModError("Failed to load and run mod \"" +
mod_name + "\":\n" + error_msg); mod_name + "\":\n" + error_msg);