mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 21:40:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'theluareloaded' into 'master'

Browse Source 
Check the result of loading from bytecode

Closes #7787

See merge request OpenMW/openmw!4189
This commit is contained in:
psi29a 2024-06-25 07:19:33 +00:00
commit 9a864f309a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/lua/luastate.cpp
View File

@ -386,7 +386,14 @@ namespace LuaUtil
{ {
auto iter = mCompiledScripts.find(path); auto iter = mCompiledScripts.find(path);
if (iter != mCompiledScripts.end()) if (iter != mCompiledScripts.end())
return mSol.load(iter->second.as_string_view(), path, sol::load_mode::binary); {
sol::load_result res = mSol.load(iter->second.as_string_view(), path, sol::load_mode::binary);
// Unless we have memory corruption issues, the bytecode is valid at this point, but loading might still
// fail because we've hit our Lua memory cap
if (!res.valid())
throw std::runtime_error("Lua error: " + res.get<std::string>());
return res;
}
sol::function res = loadFromVFS(path); sol::function res = loadFromVFS(path);
mCompiledScripts[path] = res.dump(); mCompiledScripts[path] = res.dump();
return res; return res;