Skip to content
Permalink
Browse files

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

  • Loading branch information
pauloue authored and sfan5 committed Jun 7, 2020
1 parent fe1f72a commit 09f9e465e760cb8fd791222405a9e5e68a676ba0
Showing with 6 additions and 2 deletions.
  1. +6 −2 src/script/cpp_api/s_base.cpp
@@ -187,7 +187,9 @@ void ScriptApiBase::loadScript(const std::string &script_path)
}
ok = ok && !lua_pcall(L, 0, 0, error_handler);
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
throw ModError("Failed to load and run script from " +
script_path + ":\n" + error_msg);
@@ -219,7 +221,9 @@ void ScriptApiBase::loadModFromMemory(const std::string &mod_name)
if (ok)
ok = !lua_pcall(L, 0, 0, error_handler);
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
throw ModError("Failed to load and run mod \"" +
mod_name + "\":\n" + error_msg);

0 comments on commit 09f9e46

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