From d18588dce720d5f01a67f85607328274abbb5c91 Mon Sep 17 00:00:00 2001 From: Petr Mikheev Date: Tue, 25 Apr 2023 22:11:04 +0200 Subject: [PATCH] Use LuaUtil::cast for casting sol::object to prevent crashing on type mismatch in Lua scripts. --- apps/openmw/mwlua/stats.cpp | 20 ++++++++++---------- apps/openmw/mwlua/types/actor.cpp | 6 +++--- components/lua/l10n.cpp | 10 +++++----- components/lua/scriptscontainer.cpp | 29 +++++++++++++++-------------- components/lua/serialization.cpp | 2 +- components/lua/storage.cpp | 8 ++++---- components/lua/utilpackage.cpp | 6 +++--- components/lua_ui/content.hpp | 4 ++-- components/lua_ui/element.cpp | 2 +- components/lua_ui/element.hpp | 2 +- 10 files changed, 45 insertions(+), 44 deletions(-) diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp index 040d96e288..49a3efa9d3 100644 --- a/apps/openmw/mwlua/stats.cpp +++ b/apps/openmw/mwlua/stats.cpp @@ -139,7 +139,7 @@ namespace MWLua { auto& stats = ptr.getClass().getCreatureStats(ptr); if(prop == "current") - stats.setLevel(value.as()); + stats.setLevel(LuaUtil::cast(value)); } }; @@ -179,7 +179,7 @@ namespace MWLua { auto& stats = ptr.getClass().getCreatureStats(ptr); auto stat = stats.getDynamic(index); - float floatValue = value.as(); + float floatValue = LuaUtil::cast(value); if(prop == "base") stat.setBase(floatValue); else if(prop == "current") @@ -209,9 +209,9 @@ namespace MWLua float getModified(const Context& context) const { - auto base = get(context, "base", &MWMechanics::AttributeValue::getBase).as(); - auto damage = get(context, "damage", &MWMechanics::AttributeValue::getDamage).as(); - auto modifier = get(context, "modifier", &MWMechanics::AttributeValue::getModifier).as(); + auto base = LuaUtil::cast(get(context, "base", &MWMechanics::AttributeValue::getBase)); + auto damage = LuaUtil::cast(get(context, "damage", &MWMechanics::AttributeValue::getDamage)); + auto modifier = LuaUtil::cast(get(context, "modifier", &MWMechanics::AttributeValue::getModifier)); return std::max(0.f, base - damage + modifier); // Should match AttributeValue::getModified } @@ -234,7 +234,7 @@ namespace MWLua { auto& stats = ptr.getClass().getCreatureStats(ptr); auto stat = stats.getAttribute(index); - float floatValue = value.as(); + float floatValue = LuaUtil::cast(value); if(prop == "base") stat.setBase(floatValue); else if(prop == "damage") @@ -281,9 +281,9 @@ namespace MWLua float getModified(const Context& context) const { - auto base = get(context, "base", &MWMechanics::SkillValue::getBase).as(); - auto damage = get(context, "damage", &MWMechanics::SkillValue::getDamage).as(); - auto modifier = get(context, "modifier", &MWMechanics::SkillValue::getModifier).as(); + auto base = LuaUtil::cast(get(context, "base", &MWMechanics::SkillValue::getBase)); + auto damage = LuaUtil::cast(get(context, "damage", &MWMechanics::SkillValue::getDamage)); + auto modifier = LuaUtil::cast(get(context, "modifier", &MWMechanics::SkillValue::getModifier)); return std::max(0.f, base - damage + modifier); // Should match SkillValue::getModified } @@ -315,7 +315,7 @@ namespace MWLua { auto& stats = ptr.getClass().getNpcStats(ptr); auto stat = stats.getSkill(index); - float floatValue = value.as(); + float floatValue = LuaUtil::cast(value); if(prop == "base") stat.setBase(floatValue); else if(prop == "damage") diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp index d022c631b4..34dcc3fb78 100644 --- a/apps/openmw/mwlua/types/actor.cpp +++ b/apps/openmw/mwlua/types/actor.cpp @@ -236,11 +236,11 @@ namespace MWLua SetEquipmentAction::Equipment eqp; for (auto& [key, value] : equipment) { - int slot = key.as(); + int slot = LuaUtil::cast(key); if (value.is()) - eqp[slot] = value.as().id(); + eqp[slot] = LuaUtil::cast(value).id(); else - eqp[slot] = value.as(); + eqp[slot] = LuaUtil::cast(value); } context.mLuaManager->addAction(std::make_unique(context.mLua, obj.id(), std::move(eqp))); }; diff --git a/components/lua/l10n.cpp b/components/lua/l10n.cpp index 469962d568..46fc37f59c 100644 --- a/components/lua/l10n.cpp +++ b/components/lua/l10n.cpp @@ -61,20 +61,20 @@ namespace LuaUtil { // Argument values if (value.is()) - args.push_back(icu::Formattable(value.as().c_str())); + args.push_back(icu::Formattable(LuaUtil::cast(value).c_str())); // Note: While we pass all numbers as doubles, they still seem to be handled appropriately. // Numbers can be forced to be integers using the argType number and argStyle integer // E.g. {var, number, integer} else if (value.is()) - args.push_back(icu::Formattable(value.as())); + args.push_back(icu::Formattable(LuaUtil::cast(value))); else { - Log(Debug::Error) << "Unrecognized argument type for key \"" << key.as() - << "\" when formatting message \"" << messageId << "\""; + Log(Debug::Error) << "Unrecognized argument type for key \"" << LuaUtil::cast(key) + << "\" when formatting message \"" << messageId << "\""; } // Argument names - const auto str = key.as(); + const auto str = LuaUtil::cast(key); argNames.push_back(icu::UnicodeString::fromUTF8(icu::StringPiece(str.data(), str.size()))); } return std::make_pair(args, argNames); diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp index f6758e92d7..23029913e2 100644 --- a/components/lua/scriptscontainer.cpp +++ b/components/lua/scriptscontainer.cpp @@ -79,33 +79,34 @@ namespace LuaUtil if (scriptOutput == sol::nil) return true; sol::object engineHandlers = sol::nil, eventHandlers = sol::nil; - for (const auto& [key, value] : sol::table(scriptOutput)) + for (const auto& [key, value] : cast(scriptOutput)) { - std::string_view sectionName = key.as(); + std::string_view sectionName = cast(key); if (sectionName == ENGINE_HANDLERS) engineHandlers = value; else if (sectionName == EVENT_HANDLERS) eventHandlers = value; else if (sectionName == INTERFACE_NAME) - script.mInterfaceName = value.as(); + script.mInterfaceName = cast(value); else if (sectionName == INTERFACE) - script.mInterface = value.as(); + script.mInterface = cast(value); else Log(Debug::Error) << "Not supported section '" << sectionName << "' in " << debugName; } if (engineHandlers != sol::nil) { - for (const auto& [key, fn] : sol::table(engineHandlers)) + for (const auto& [key, handler] : cast(engineHandlers)) { - std::string_view handlerName = key.as(); + std::string_view handlerName = cast(key); + sol::function fn = cast(handler); if (handlerName == HANDLER_INIT) - onInit = sol::function(fn); + onInit = fn; else if (handlerName == HANDLER_LOAD) - onLoad = sol::function(fn); + onLoad = fn; else if (handlerName == HANDLER_SAVE) - script.mOnSave = sol::function(fn); + script.mOnSave = fn; else if (handlerName == HANDLER_INTERFACE_OVERRIDE) - script.mOnOverride = sol::function(fn); + script.mOnOverride = fn; else { auto it = mEngineHandlers.find(handlerName); @@ -118,13 +119,13 @@ namespace LuaUtil } if (eventHandlers != sol::nil) { - for (const auto& [key, fn] : sol::table(eventHandlers)) + for (const auto& [key, fn] : cast(eventHandlers)) { - std::string_view eventName = key.as(); + std::string_view eventName = cast(key); auto it = mEventHandlers.find(eventName); if (it == mEventHandlers.end()) it = mEventHandlers.emplace(std::string(eventName), EventHandlerList()).first; - insertHandler(it->second, scriptId, fn); + insertHandler(it->second, scriptId, cast(fn)); } } @@ -280,7 +281,7 @@ namespace LuaUtil try { sol::object res = LuaUtil::call(list[i].mFn, data); - if (res != sol::nil && !res.as()) + if (res.is() && !res.as()) break; // Skip other handlers if 'false' was returned. } catch (std::exception& e) diff --git a/components/lua/serialization.cpp b/components/lua/serialization.cpp index f1ee7c1aae..1952949d30 100644 --- a/components/lua/serialization.cpp +++ b/components/lua/serialization.cpp @@ -106,7 +106,7 @@ namespace LuaUtil bool BasicSerializer::serialize(BinaryData& out, const sol::userdata& data) const { - appendRefNum(out, data.as()); + appendRefNum(out, cast(data)); return true; } diff --git a/components/lua/storage.cpp b/components/lua/storage.cpp index 11ab186018..a14f839e8d 100644 --- a/components/lua/storage.cpp +++ b/components/lua/storage.cpp @@ -80,7 +80,7 @@ namespace LuaUtil if (values) { for (const auto& [k, v] : *values) - mValues[k.as()] = Value(v); + mValues[cast(k)] = Value(v); } if (mStorage->mListener) mStorage->mListener->sectionReplaced(mSectionName, values); @@ -165,9 +165,9 @@ namespace LuaUtil sol::table data = deserialize(mLua, serializedData); for (const auto& [sectionName, sectionTable] : data) { - const std::shared_ptr
& section = getSection(sectionName.as()); - for (const auto& [key, value] : sol::table(sectionTable)) - section->set(key.as(), value); + const std::shared_ptr
& section = getSection(cast(sectionName)); + for (const auto& [key, value] : cast(sectionTable)) + section->set(cast(key), value); } } catch (std::exception& e) diff --git a/components/lua/utilpackage.cpp b/components/lua/utilpackage.cpp index 88cf7cb17a..392a3f7c7a 100644 --- a/components/lua/utilpackage.cpp +++ b/components/lua/utilpackage.cpp @@ -230,19 +230,19 @@ namespace LuaUtil util["bitOr"] = [](unsigned a, sol::variadic_args va) { for (const auto& v : va) - a |= v.as(); + a |= cast(v); return a; }; util["bitAnd"] = [](unsigned a, sol::variadic_args va) { for (const auto& v : va) - a &= v.as(); + a &= cast(v); return a; }; util["bitXor"] = [](unsigned a, sol::variadic_args va) { for (const auto& v : va) - a ^= v.as(); + a ^= cast(v); return a; }; util["bitNot"] = [](unsigned a) { return ~a; }; diff --git a/components/lua_ui/content.hpp b/components/lua_ui/content.hpp index 2caa1ff8dc..c8bb82ecf3 100644 --- a/components/lua_ui/content.hpp +++ b/components/lua_ui/content.hpp @@ -78,7 +78,7 @@ namespace LuaUi { sol::object result = callMethod("indexOf", name); if (result.is()) - return fromLua(result.as()); + return fromLua(LuaUtil::cast(result)); else return std::nullopt; } @@ -86,7 +86,7 @@ namespace LuaUi { sol::object result = callMethod("indexOf", table); if (result.is()) - return fromLua(result.as()); + return fromLua(LuaUtil::cast(result)); else return std::nullopt; } diff --git a/components/lua_ui/element.cpp b/components/lua_ui/element.cpp index 738bf5228b..ccf54ddec4 100644 --- a/components/lua_ui/element.cpp +++ b/components/lua_ui/element.cpp @@ -62,7 +62,7 @@ namespace LuaUi destroyWidget(w); return result; } - ContentView content(contentObj.as()); + ContentView content(LuaUtil::cast(contentObj)); result.resize(content.size()); size_t minSize = std::min(children.size(), content.size()); for (size_t i = 0; i < minSize; i++) diff --git a/components/lua_ui/element.hpp b/components/lua_ui/element.hpp index 8151b4f88c..ca4aaa3a5b 100644 --- a/components/lua_ui/element.hpp +++ b/components/lua_ui/element.hpp @@ -36,7 +36,7 @@ namespace LuaUi private: Element(sol::table layout); - sol::table layout() { return mLayout.as(); } + sol::table layout() { return LuaUtil::cast(mLayout); } static std::map> sAllElements; void updateAttachment(); };