mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-03 17:37:18 +00:00
Code Issues Projects Releases Wiki Activity

Test LuaUtil::safeGet preventing crash

Browse Source
This commit is contained in:
uramer 2024-02-12 22:54:35 +01:00 committed by Anton Uramer
parent 550659c2d9
commit 08b7ee8a44
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/openmw_test_suite/lua/test_lua.cpp
View File

@ -51,6 +51,9 @@ return {
}
)X");
TestingOpenMW::VFSTestFile metaIndexErrorFile(
"return setmetatable({}, { __index = function(t, key) error('meta index error') end })");
std::string genBigScript()
{
std::stringstream buf;
@ -70,7 +73,7 @@ return {
{
std::unique_ptr<VFS::Manager> mVFS = TestingOpenMW::createTestVFS({ { "aaa/counter.lua", &counterFile },
{ "bbb/tests.lua", &testsFile }, { "invalid.lua", &invalidScriptFile }, { "big.lua", &bigScriptFile },
{ "requireBig.lua", &requireBigScriptFile } });
{ "requireBig.lua", &requireBigScriptFile }, { "metaIndexError.lua", &metaIndexErrorFile } });
LuaUtil::ScriptsConfiguration mCfg;
LuaUtil::LuaState mLua{ mVFS.get(), &mCfg };
@ -223,4 +226,11 @@ return {
// At this moment all instances of the script should be garbage-collected.
EXPECT_LT(memWithoutScript, memWithScript);
}
TEST_F(LuaStateTest, SafeIndexMetamethod)
{
sol::table t = mLua.runInNewSandbox("metaIndexError.lua");
// without safe get we crash here
EXPECT_ERROR(LuaUtil::safeGet(t, "any key"), "meta index error");
}
}

4
components/lua/luastate.hpp
View File

@ -235,7 +235,7 @@ namespace LuaUtil
// work around for a (likely) sol3 bug
// when the index meta method throws, simply calling table.get crashes instead of re-throwing the error
template <class Key>
sol::object safe_get(const sol::table& table, const Key& key)
sol::object safeGet(const sol::table& table, const Key& key)
{
auto index = table.traverse_raw_get<sol::optional<sol::main_protected_function>>(
sol::metatable_key, sol::meta_function::index);
@ -257,7 +257,7 @@ namespace LuaUtil
{
if (!table.is<sol::table>())
return sol::nil;
sol::object value = safe_get(table.as<sol::table>(), first);
sol::object value = safeGet(table.as<sol::table>(), first);
if constexpr (sizeof...(str) == 0)
return value;
else