Triplehx3/luanti
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor how script api reads current mod name

Browse Source 
This is to prevent future mistakes and make it clearer whether
the mod name can be trusted depending on how it is retrieved.
This commit is contained in:
sfan5
2024-02-14 13:29:53 +01:00
parent cb5fa56e17
commit ce97210eb1
8 changed files with 88 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/script/lua_api/l_server.cpp
View File

@@ -440,7 +440,11 @@ int ModApiServer::l_show_formspec(lua_State *L)
int ModApiServer::l_get_current_modname(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
std::string s = ScriptApiBase::getCurrentModNameInsecure(L);
if (!s.empty())
lua_pushstring(L, s.c_str());
else
lua_pushnil(L);
return 1;
}
@@ -656,11 +660,9 @@ int ModApiServer::l_register_async_dofile(lua_State *L)
std::string path = readParam<std::string>(L, 1);
CHECK_SECURE_PATH(L, path.c_str(), false);
// Find currently running mod name (only at init time)
lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
if (!lua_isstring(L, -1))
return 0;
std::string modname = readParam<std::string>(L, -1);
std::string modname = ScriptApiBase::getCurrentModNameInsecure(L);
if (modname.empty())
throw ModError("cannot determine mod name");
getServer(L)->m_async_init_files.emplace_back(modname, path);
lua_pushboolean(L, true);
@@ -675,11 +677,9 @@ int ModApiServer::l_register_mapgen_script(lua_State *L)
std::string path = readParam<std::string>(L, 1);
CHECK_SECURE_PATH(L, path.c_str(), false);
// Find currently running mod name (only at init time)
lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_CURRENT_MOD_NAME);
if (!lua_isstring(L, -1))
return 0;
std::string modname = readParam<std::string>(L, -1);
std::string modname = ScriptApiBase::getCurrentModNameInsecure(L);
if (modname.empty())
throw ModError("cannot determine mod name");
getServer(L)->m_mapgen_init_files.emplace_back(modname, path);
lua_pushboolean(L, true);