Merge branch 'mainmembers' into 'master'

Capostrophic · Capostrophic · commit 5f92d520ee8d · 2025-03-07T00:25:35.000+03:00
Fix more potential use-after-free issues

See merge request OpenMW/openmw!4566
diff --git a/apps/openmw/mwlua/itemdata.cpp b/apps/openmw/mwlua/itemdata.cpp
@@ -71,7 +71,8 @@ namespace MWLua
             {
                 SelfObject* obj = mObject.asSelfObject();
                 addStatUpdateAction(context.mLuaManager, *obj);
-                obj->mStatsCache[SelfObject::CachedStat{ &ItemData::setValue, std::monostate{}, prop }] = value;
+                obj->mStatsCache[SelfObject::CachedStat{ &ItemData::setValue, std::monostate{}, prop }]
+                    = sol::main_object(value);
             }
             else
                 throw std::runtime_error("Only global or self scripts can set the value");
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
@@ -54,7 +54,7 @@ namespace MWLua
         {
         }
         MWBase::LuaManager::ActorControls mControls;
-        std::map<CachedStat, sol::object> mStatsCache;
+        std::map<CachedStat, sol::main_object> mStatsCache;
         bool mIsActive;
     };
 
diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp
@@ -123,7 +123,8 @@ namespace MWLua
 
             SelfObject* obj = mObject.asSelfObject();
             addStatUpdateAction(context.mLuaManager, *obj);
-            obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, attributeId, "skillIncreasesForAttribute" }] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, attributeId, "skillIncreasesForAttribute" }]
+                = sol::main_object(value);
         }
     };
 
@@ -159,7 +160,7 @@ namespace MWLua
             SelfObject* obj = mObject.asSelfObject();
             addStatUpdateAction(context.mLuaManager, *obj);
             obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, specialization, "skillIncreasesForSpecialization" }]
-                = value;
+                = sol::main_object(value);
         }
     };
 
@@ -183,7 +184,8 @@ namespace MWLua
         {
             SelfObject* obj = mObject.asSelfObject();
             addStatUpdateAction(context.mLuaManager, *obj);
-            obj->mStatsCache[SelfObject::CachedStat{ &setCreatureValue, std::monostate{}, "current" }] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &setCreatureValue, std::monostate{}, "current" }]
+                = sol::main_object(value);
         }
 
         sol::object getProgress(const Context& context) const
@@ -204,7 +206,8 @@ namespace MWLua
 
             SelfObject* obj = mObject.asSelfObject();
             addStatUpdateAction(context.mLuaManager, *obj);
-            obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, std::monostate{}, "progress" }] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, std::monostate{}, "progress" }]
+                = sol::main_object(value);
         }
 
         SkillIncreasesForAttributeStats getSkillIncreasesForAttributeStats() const
@@ -258,7 +261,7 @@ namespace MWLua
         {
             SelfObject* obj = mObject.asSelfObject();
             addStatUpdateAction(context.mLuaManager, *obj);
-            obj->mStatsCache[SelfObject::CachedStat{ &DynamicStat::setValue, mIndex, prop }] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &DynamicStat::setValue, mIndex, prop }] = sol::main_object(value);
         }
 
         static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
@@ -318,7 +321,7 @@ namespace MWLua
         {
             SelfObject* obj = mObject.asSelfObject();
             addStatUpdateAction(context.mLuaManager, *obj);
-            obj->mStatsCache[SelfObject::CachedStat{ &AttributeStat::setValue, mId, prop }] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &AttributeStat::setValue, mId, prop }] = sol::main_object(value);
         }
 
         static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
@@ -402,7 +405,7 @@ namespace MWLua
         {
             SelfObject* obj = mObject.asSelfObject();
             addStatUpdateAction(context.mLuaManager, *obj);
-            obj->mStatsCache[SelfObject::CachedStat{ &SkillStat::setValue, mId, prop }] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &SkillStat::setValue, mId, prop }] = sol::main_object(value);
         }
 
         static void setValue(Index index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
@@ -465,7 +468,8 @@ namespace MWLua
         {
             SelfObject* obj = mObject.asSelfObject();
             addStatUpdateAction(context.mLuaManager, *obj);
-            obj->mStatsCache[SelfObject::CachedStat{ &AIStat::setValue, static_cast<int>(mIndex), prop }] = value;
+            obj->mStatsCache[SelfObject::CachedStat{ &AIStat::setValue, static_cast<int>(mIndex), prop }]
+                = sol::main_object(value);
         }
 
         static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
diff --git a/apps/openmw/mwlua/uibindings.cpp b/apps/openmw/mwlua/uibindings.cpp
@@ -168,7 +168,8 @@ namespace MWLua
             if (index == LuaUi::Layer::count())
                 throw std::logic_error(std::string("Layer not found"));
             index++;
-            context.mLuaManager->addAction([=]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
+            context.mLuaManager->addAction(
+                [=, name = std::string(name)]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
         };
         layersTable["insertBefore"] = [context](
                                           std::string_view beforename, std::string_view name, const sol::object& opt) {
@@ -177,7 +178,8 @@ namespace MWLua
             size_t index = LuaUi::Layer::indexOf(beforename);
             if (index == LuaUi::Layer::count())
                 throw std::logic_error(std::string("Layer not found"));
-            context.mLuaManager->addAction([=]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
+            context.mLuaManager->addAction(
+                [=, name = std::string(name)]() { LuaUi::Layer::insert(index, name, options); }, "Insert UI layer");
         };
         sol::table layers = LuaUtil::makeReadOnly(layersTable);
         sol::table layersMeta = layers[sol::metatable_key];
@@ -285,8 +287,9 @@ namespace MWLua
             return res;
         };
         api["_setWindowDisabled"]
-            = [windowManager, luaManager = context.mLuaManager](std::string_view window, bool disabled) {
-                  luaManager->addAction([=]() { windowManager->setDisabledByLua(window, disabled); });
+            = [windowManager, luaManager = context.mLuaManager](std::string window, bool disabled) {
+                  luaManager->addAction(
+                      [=, window = std::move(window)]() { windowManager->setDisabledByLua(window, disabled); });
               };
 
         // TODO
@@ -308,7 +311,7 @@ namespace MWLua
                 return res.str();
             };
             element["layout"] = sol::property([](const LuaUi::Element& element) { return element.mLayout; },
-                [](LuaUi::Element& element, const sol::table& layout) { element.mLayout = layout; });
+                [](LuaUi::Element& element, const sol::main_table& layout) { element.mLayout = layout; });
             element["update"] = [luaManager = context.mLuaManager](const std::shared_ptr<LuaUi::Element>& element) {
                 if (element->mState != LuaUi::Element::Created)
                     return;
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
@@ -343,7 +343,8 @@ namespace LuaUtil
     }
 
     sol::protected_function_result LuaState::runInNewSandbox(const VFS::Path::Normalized& path,
-        const std::string& envName, const std::map<std::string, sol::object>& packages, const sol::object& hiddenData)
+        const std::string& envName, const std::map<std::string, sol::main_object>& packages,
+        const sol::main_object& hiddenData)
     {
         // TODO
         sol::protected_function script = loadScriptAndCache(path);
diff --git a/components/lua/luastate.hpp b/components/lua/luastate.hpp
@@ -148,8 +148,8 @@ namespace LuaUtil
         //         should be either a sol::table or a sol::function. If it is a function, it will be evaluated
         //         (once per sandbox) with the argument 'hiddenData' the first time when requested.
         sol::protected_function_result runInNewSandbox(const VFS::Path::Normalized& path,
-            const std::string& envName = "unnamed", const std::map<std::string, sol::object>& packages = {},
-            const sol::object& hiddenData = sol::nil);
+            const std::string& envName = "unnamed", const std::map<std::string, sol::main_object>& packages = {},
+            const sol::main_object& hiddenData = sol::nil);
 
         void dropScriptCache() { mCompiledScripts.clear(); }
 
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
@@ -52,7 +52,7 @@ namespace LuaUtil
         Log(Debug::Error) << mNamePrefix << "[" << scriptPath(scriptId) << "] " << msg << ": " << e.what();
     }
 
-    void ScriptsContainer::addPackage(std::string packageName, sol::object package)
+    void ScriptsContainer::addPackage(std::string packageName, sol::main_object package)
     {
         if (!package.is<sol::userdata>())
             throw std::logic_error("Expected package to be read-only: " + packageName);
@@ -312,7 +312,7 @@ namespace LuaUtil
         {
             if (next->mOnOverride)
             {
-                sol::object prevInterface = sol::nil;
+                sol::main_object prevInterface = sol::nil;
                 if (prev)
                     prevInterface = *prev->mInterface;
                 try
diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
@@ -90,7 +90,7 @@ namespace LuaUtil
 
         // Adds package that will be available (via `require`) for all scripts in the container.
         // Automatically applies LuaUtil::makeReadOnly to the package.
-        void addPackage(std::string packageName, sol::object package);
+        void addPackage(std::string packageName, sol::main_object package);
 
         // Gets script with given id from ScriptsConfiguration, finds the source in the virtual file system, starts as a
         // new script, adds it to the container, and calls onInit for this script. Returns `true` if the script was
@@ -168,7 +168,7 @@ namespace LuaUtil
         struct Handler
         {
             int mScriptId;
-            sol::function mFn;
+            sol::main_function mFn;
         };
 
         struct EngineHandlerList
@@ -212,11 +212,11 @@ namespace LuaUtil
     private:
         struct Script
         {
-            std::optional<sol::function> mOnSave;
-            std::optional<sol::function> mOnOverride;
-            std::optional<sol::table> mInterface;
+            std::optional<sol::main_function> mOnSave;
+            std::optional<sol::main_function> mOnOverride;
+            std::optional<sol::main_table> mInterface;
             std::string mInterfaceName;
-            sol::table mHiddenData;
+            sol::main_table mHiddenData;
             std::map<std::string, sol::main_protected_function> mRegisteredCallbacks;
             std::map<int64_t, sol::main_protected_function> mTemporaryCallbacks;
             VFS::Path::Normalized mPath;
@@ -268,11 +268,11 @@ namespace LuaUtil
         const UserdataSerializer* mSerializer = nullptr;
         const UserdataSerializer* mSavedDataDeserializer = nullptr;
 
-        std::map<std::string, sol::object> mAPI;
+        std::map<std::string, sol::main_object> mAPI;
         struct LoadedData
         {
             std::map<int, Script> mScripts;
-            sol::table mPublicInterfaces;
+            sol::main_table mPublicInterfaces;
 
             std::map<std::string, EventHandlerList, std::less<>> mEventHandlers;
 
diff --git a/components/lua/storage.cpp b/components/lua/storage.cpp
@@ -37,7 +37,7 @@ namespace LuaUtil
     sol::object LuaStorage::Value::getReadOnly(lua_State* L) const
     {
         if (mReadOnlyValue == sol::nil && !mSerializedValue.empty())
-            mReadOnlyValue = deserialize(L, mSerializedValue, nullptr, true);
+            mReadOnlyValue = sol::main_object(deserialize(L, mSerializedValue, nullptr, true));
         return mReadOnlyValue;
     }
 
diff --git a/components/lua/storage.hpp b/components/lua/storage.hpp
@@ -74,7 +74,7 @@ namespace LuaUtil
 
         private:
             std::string mSerializedValue;
-            mutable sol::object mReadOnlyValue = sol::nil;
+            mutable sol::main_object mReadOnlyValue = sol::nil;
         };
 
         struct Section
diff --git a/components/lua_ui/content.hpp b/components/lua_ui/content.hpp
@@ -18,7 +18,7 @@ namespace LuaUi
     {
     public:
         // accepts only Lua tables returned by ui.content
-        explicit ContentView(sol::table table)
+        explicit ContentView(sol::main_table table)
             : mTable(std::move(table))
         {
             if (!isValidContent(mTable))
@@ -94,7 +94,7 @@ namespace LuaUi
         sol::table getMetatable() const { return mTable[sol::metatable_key].get<sol::table>(); }
 
     private:
-        sol::table mTable;
+        sol::main_table mTable;
 
         template <typename... Arg>
         sol::object callMethod(std::string_view name, Arg&&... arg) const
diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp
@@ -324,7 +324,7 @@ namespace LuaUi
                 destroyRoot(mRoot);
                 mRoot = nullptr;
             }
-            mLayout = sol::make_object(mLayout.lua_state(), sol::nil);
+            mLayout.reset();
         }
         mState = Destroyed;
     }
diff --git a/components/lua_ui/element.hpp b/components/lua_ui/element.hpp
@@ -19,7 +19,7 @@ namespace LuaUi
         }
 
         WidgetExtension* mRoot;
-        sol::object mLayout;
+        sol::main_object mLayout;
         std::string mLayer;
 
         enum State
diff --git a/components/lua_ui/widget.cpp b/components/lua_ui/widget.cpp
@@ -281,7 +281,7 @@ namespace LuaUi
         updateChildrenCoord();
     }
 
-    void WidgetExtension::setProperties(const sol::object& props)
+    void WidgetExtension::setProperties(const sol::main_object& props)
     {
         mProperties = props;
         updateProperties();
diff --git a/components/lua_ui/widget.hpp b/components/lua_ui/widget.hpp
@@ -50,10 +50,10 @@ namespace LuaUi
         void setCallback(const std::string&, const LuaUtil::Callback&);
         void clearCallbacks();
 
-        void setProperties(const sol::object& props);
-        void setTemplateProperties(const sol::object& props) { mTemplateProperties = props; }
+        void setProperties(const sol::main_object& props);
+        void setTemplateProperties(const sol::main_object& props) { mTemplateProperties = props; }
 
-        void setExternal(const sol::object& external) { mExternal = external; }
+        void setExternal(const sol::main_object& external) { mExternal = external; }
 
         MyGUI::IntCoord forcedCoord();
         void forceCoord(const MyGUI::IntCoord& offset);
@@ -63,7 +63,7 @@ namespace LuaUi
 
         virtual void updateCoord();
 
-        const sol::table& getLayout() { return mLayout; }
+        const sol::main_table& getLayout() { return mLayout; }
         void setLayout(const sol::table& layout) { mLayout = layout; }
 
         template <typename T>
@@ -150,10 +150,10 @@ namespace LuaUi
         std::vector<WidgetExtension*> mTemplateChildren;
         WidgetExtension* mSlot;
         std::map<std::string, LuaUtil::Callback, std::less<>> mCallbacks;
-        sol::table mLayout;
-        sol::object mProperties;
-        sol::object mTemplateProperties;
-        sol::object mExternal;
+        sol::main_table mLayout;
+        sol::main_object mProperties;
+        sol::main_object mTemplateProperties;
+        sol::main_object mExternal;
         WidgetExtension* mParent;
         bool mTemplateChild;
         bool mElementRoot;

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ namespace MWLua`
`71`	`71`	`{`
`72`	`72`	`SelfObject* obj = mObject.asSelfObject();`
`73`	`73`	`addStatUpdateAction(context.mLuaManager, *obj);`
`74`		`- obj->mStatsCache[SelfObject::CachedStat{ &ItemData::setValue, std::monostate{}, prop }] = value;`
	`74`	`+ obj->mStatsCache[SelfObject::CachedStat{ &ItemData::setValue, std::monostate{}, prop }]`
	`75`	`+ = sol::main_object(value);`
`75`	`76`	`}`
`76`	`77`	`else`
`77`	`78`	`throw std::runtime_error("Only global or self scripts can set the value");`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ namespace MWLua`
`54`	`54`	`{`
`55`	`55`	`}`
`56`	`56`	`MWBase::LuaManager::ActorControls mControls;`
`57`		`- std::map<CachedStat, sol::object> mStatsCache;`
	`57`	`+ std::map<CachedStat, sol::main_object> mStatsCache;`
`58`	`58`	`bool mIsActive;`
`59`	`59`	`};`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,8 @@ namespace MWLua`
`123`	`123`
`124`	`124`	`SelfObject* obj = mObject.asSelfObject();`
`125`	`125`	`addStatUpdateAction(context.mLuaManager, *obj);`
`126`		`- obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, attributeId, "skillIncreasesForAttribute" }] = value;`
	`126`	`+ obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, attributeId, "skillIncreasesForAttribute" }]`
	`127`	`+ = sol::main_object(value);`
`127`	`128`	`}`
`128`	`129`	`};`
`129`	`130`
`@@ -159,7 +160,7 @@ namespace MWLua`
`159`	`160`	`SelfObject* obj = mObject.asSelfObject();`
`160`	`161`	`addStatUpdateAction(context.mLuaManager, *obj);`
`161`	`162`	`obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, specialization, "skillIncreasesForSpecialization" }]`
`162`		`- = value;`
	`163`	`+ = sol::main_object(value);`
`163`	`164`	`}`
`164`	`165`	`};`
`165`	`166`
`@@ -183,7 +184,8 @@ namespace MWLua`
`183`	`184`	`{`
`184`	`185`	`SelfObject* obj = mObject.asSelfObject();`
`185`	`186`	`addStatUpdateAction(context.mLuaManager, *obj);`
`186`		`- obj->mStatsCache[SelfObject::CachedStat{ &setCreatureValue, std::monostate{}, "current" }] = value;`
	`187`	`+ obj->mStatsCache[SelfObject::CachedStat{ &setCreatureValue, std::monostate{}, "current" }]`
	`188`	`+ = sol::main_object(value);`
`187`	`189`	`}`
`188`	`190`
`189`	`191`	`sol::object getProgress(const Context& context) const`
`@@ -204,7 +206,8 @@ namespace MWLua`
`204`	`206`
`205`	`207`	`SelfObject* obj = mObject.asSelfObject();`
`206`	`208`	`addStatUpdateAction(context.mLuaManager, *obj);`
`207`		`- obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, std::monostate{}, "progress" }] = value;`
	`209`	`+ obj->mStatsCache[SelfObject::CachedStat{ &setNpcValue, std::monostate{}, "progress" }]`
	`210`	`+ = sol::main_object(value);`
`208`	`211`	`}`
`209`	`212`
`210`	`213`	`SkillIncreasesForAttributeStats getSkillIncreasesForAttributeStats() const`
`@@ -258,7 +261,7 @@ namespace MWLua`
`258`	`261`	`{`
`259`	`262`	`SelfObject* obj = mObject.asSelfObject();`
`260`	`263`	`addStatUpdateAction(context.mLuaManager, *obj);`
`261`		`- obj->mStatsCache[SelfObject::CachedStat{ &DynamicStat::setValue, mIndex, prop }] = value;`
	`264`	`+ obj->mStatsCache[SelfObject::CachedStat{ &DynamicStat::setValue, mIndex, prop }] = sol::main_object(value);`
`262`	`265`	`}`
`263`	`266`
`264`	`267`	`static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)`
`@@ -318,7 +321,7 @@ namespace MWLua`
`318`	`321`	`{`
`319`	`322`	`SelfObject* obj = mObject.asSelfObject();`
`320`	`323`	`addStatUpdateAction(context.mLuaManager, *obj);`
`321`		`- obj->mStatsCache[SelfObject::CachedStat{ &AttributeStat::setValue, mId, prop }] = value;`
	`324`	`+ obj->mStatsCache[SelfObject::CachedStat{ &AttributeStat::setValue, mId, prop }] = sol::main_object(value);`
`322`	`325`	`}`
`323`	`326`
`324`	`327`	`static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)`
`@@ -402,7 +405,7 @@ namespace MWLua`
`402`	`405`	`{`
`403`	`406`	`SelfObject* obj = mObject.asSelfObject();`
`404`	`407`	`addStatUpdateAction(context.mLuaManager, *obj);`
`405`		`- obj->mStatsCache[SelfObject::CachedStat{ &SkillStat::setValue, mId, prop }] = value;`
	`408`	`+ obj->mStatsCache[SelfObject::CachedStat{ &SkillStat::setValue, mId, prop }] = sol::main_object(value);`
`406`	`409`	`}`
`407`	`410`
`408`	`411`	`static void setValue(Index index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)`
`@@ -465,7 +468,8 @@ namespace MWLua`
`465`	`468`	`{`
`466`	`469`	`SelfObject* obj = mObject.asSelfObject();`
`467`	`470`	`addStatUpdateAction(context.mLuaManager, *obj);`
`468`		`- obj->mStatsCache[SelfObject::CachedStat{ &AIStat::setValue, static_cast<int>(mIndex), prop }] = value;`
	`471`	`+ obj->mStatsCache[SelfObject::CachedStat{ &AIStat::setValue, static_cast<int>(mIndex), prop }]`
	`472`	`+ = sol::main_object(value);`
`469`	`473`	`}`
`470`	`474`
`471`	`475`	`static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,8 @@ namespace LuaUtil`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`sol::protected_function_result LuaState::runInNewSandbox(const VFS::Path::Normalized& path,`
`346`		`- const std::string& envName, const std::map<std::string, sol::object>& packages, const sol::object& hiddenData)`
	`346`	`+ const std::string& envName, const std::map<std::string, sol::main_object>& packages,`
	`347`	`+ const sol::main_object& hiddenData)`
`347`	`348`	`{`
`348`	`349`	`// TODO`
`349`	`350`	`sol::protected_function script = loadScriptAndCache(path);`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ namespace LuaUtil`
`52`	`52`	`Log(Debug::Error) << mNamePrefix << "[" << scriptPath(scriptId) << "] " << msg << ": " << e.what();`
`53`	`53`	`}`
`54`	`54`
`55`		`- void ScriptsContainer::addPackage(std::string packageName, sol::object package)`
	`55`	`+ void ScriptsContainer::addPackage(std::string packageName, sol::main_object package)`
`56`	`56`	`{`
`57`	`57`	`if (!package.is<sol::userdata>())`
`58`	`58`	`throw std::logic_error("Expected package to be read-only: " + packageName);`
`@@ -312,7 +312,7 @@ namespace LuaUtil`
`312`	`312`	`{`
`313`	`313`	`if (next->mOnOverride)`
`314`	`314`	`{`
`315`		`- sol::object prevInterface = sol::nil;`
	`315`	`+ sol::main_object prevInterface = sol::nil;`
`316`	`316`	`if (prev)`
`317`	`317`	`prevInterface = *prev->mInterface;`
`318`	`318`	`try`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ namespace LuaUtil`
`37`	`37`	`sol::object LuaStorage::Value::getReadOnly(lua_State* L) const`
`38`	`38`	`{`
`39`	`39`	`if (mReadOnlyValue == sol::nil && !mSerializedValue.empty())`
`40`		`- mReadOnlyValue = deserialize(L, mSerializedValue, nullptr, true);`
	`40`	`+ mReadOnlyValue = sol::main_object(deserialize(L, mSerializedValue, nullptr, true));`
`41`	`41`	`return mReadOnlyValue;`
`42`	`42`	`}`
`43`	`43`