From e2cf80e3a6a2d92561f1df98ef3647457290e588 Mon Sep 17 00:00:00 2001
From: Aussiemon <Aussiemon@users.noreply.github.com>
Date: Tue, 3 Jun 2025 19:34:10 -0600
Subject: [PATCH 1/2] Protect more bindings from non-finite numbers

---
 apps/openmw/mwlua/animationbindings.cpp |  5 ++++-
 apps/openmw/mwlua/worldbindings.cpp     |  8 +++++--
 components/misc/finitenumbers.hpp       | 29 +++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwlua/animationbindings.cpp b/apps/openmw/mwlua/animationbindings.cpp
index 22ebd7e33a..2f6f60ea3e 100644
--- a/apps/openmw/mwlua/animationbindings.cpp
+++ b/apps/openmw/mwlua/animationbindings.cpp
@@ -5,6 +5,7 @@
 #include <components/lua/asyncpackage.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/lua/utilpackage.hpp>
+#include <components/misc/finitenumbers.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/settings/values.hpp>
 
@@ -99,6 +100,8 @@ namespace MWLua
 
     sol::table initAnimationPackage(const Context& context)
     {
+        using FiniteFloat = Misc::FiniteFloat;
+
         auto view = context.sol();
         auto mechanics = MWBase::Environment::get().getMechanicsManager();
         auto world = MWBase::Environment::get().getWorld();
@@ -197,7 +200,7 @@ namespace MWLua
                 return speed;
             return sol::nullopt;
         };
-        api["setSpeed"] = [](const sol::object& object, std::string groupname, float speed) {
+        api["setSpeed"] = [](const sol::object& object, std::string groupname, const FiniteFloat speed) {
             getMutableAnimationOrThrow(ObjectVariant(object))->adjustSpeedMult(groupname, speed);
         };
         api["getActiveGroup"] = [](const sol::object& object, MWRender::BoneGroup boneGroup) -> std::string_view {
diff --git a/apps/openmw/mwlua/worldbindings.cpp b/apps/openmw/mwlua/worldbindings.cpp
index ac7bd307cf..a4352c215a 100644
--- a/apps/openmw/mwlua/worldbindings.cpp
+++ b/apps/openmw/mwlua/worldbindings.cpp
@@ -10,6 +10,7 @@
 #include <components/esm3/loadskil.hpp>
 #include <components/esm3/loadweap.hpp>
 #include <components/lua/luastate.hpp>
+#include <components/misc/finitenumbers.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
@@ -56,10 +57,13 @@ namespace MWLua
 
     static void addWorldTimeBindings(sol::table& api, const Context& context)
     {
+        using FiniteDouble = Misc::FiniteDouble;
+        using FiniteFloat = Misc::FiniteFloat;
+
         MWWorld::DateTimeManager* timeManager = MWBase::Environment::get().getWorld()->getTimeManager();
 
-        api["setGameTimeScale"] = [timeManager](double scale) { timeManager->setGameTimeScale(scale); };
-        api["setSimulationTimeScale"] = [context, timeManager](float scale) {
+        api["setGameTimeScale"] = [timeManager](const FiniteDouble scale) { timeManager->setGameTimeScale(scale); };
+        api["setSimulationTimeScale"] = [context, timeManager](const FiniteFloat scale) {
             context.mLuaManager->addAction([scale, timeManager] { timeManager->setSimulationTimeScale(scale); });
         };
 
diff --git a/components/misc/finitenumbers.hpp b/components/misc/finitenumbers.hpp
index 3d166ee26d..7d27987c5f 100644
--- a/components/misc/finitenumbers.hpp
+++ b/components/misc/finitenumbers.hpp
@@ -8,6 +8,18 @@
 
 namespace Misc
 {
+    struct FiniteDouble
+    {
+        double mValue;
+        FiniteDouble(double v)
+        {
+            if (!std::isfinite(v))
+                throw std::invalid_argument("Value must be a finite number");
+            mValue = v;
+        }
+        operator double() const { return mValue; }
+    };
+
     struct FiniteFloat
     {
         float mValue;
@@ -23,8 +35,25 @@ namespace Misc
 
 namespace sol
 {
+    using FiniteDouble = Misc::FiniteDouble;
     using FiniteFloat = Misc::FiniteFloat;
 
+    template <typename Handler>
+    bool sol_lua_check(
+        sol::types<FiniteDouble>, lua_State* L, int index, Handler&& handler, sol::stack::record& tracking)
+    {
+        bool success = sol::stack::check<double>(L, lua_absindex(L, index), handler);
+        tracking.use(1);
+        return success;
+    }
+
+    static FiniteDouble sol_lua_get(sol::types<FiniteDouble>, lua_State* L, int index, sol::stack::record& tracking)
+    {
+        double val = sol::stack::get<double>(L, lua_absindex(L, index));
+        tracking.use(1);
+        return FiniteDouble(val);
+    }
+
     template <typename Handler>
     bool sol_lua_check(
         sol::types<FiniteFloat>, lua_State* L, int index, Handler&& handler, sol::stack::record& tracking)

From 0d96d71be685dc22562dda9e075f4a8de3a2e2c3 Mon Sep 17 00:00:00 2001
From: Aussiemon <Aussiemon@users.noreply.github.com>
Date: Wed, 4 Jun 2025 11:40:53 -0600
Subject: [PATCH 2/2] Change World.setGameTimeScale to float

---
 apps/openmw/mwlua/worldbindings.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwlua/worldbindings.cpp b/apps/openmw/mwlua/worldbindings.cpp
index a4352c215a..c960c4e9e4 100644
--- a/apps/openmw/mwlua/worldbindings.cpp
+++ b/apps/openmw/mwlua/worldbindings.cpp
@@ -57,12 +57,11 @@ namespace MWLua
 
     static void addWorldTimeBindings(sol::table& api, const Context& context)
     {
-        using FiniteDouble = Misc::FiniteDouble;
         using FiniteFloat = Misc::FiniteFloat;
 
         MWWorld::DateTimeManager* timeManager = MWBase::Environment::get().getWorld()->getTimeManager();
 
-        api["setGameTimeScale"] = [timeManager](const FiniteDouble scale) { timeManager->setGameTimeScale(scale); };
+        api["setGameTimeScale"] = [timeManager](const FiniteFloat scale) { timeManager->setGameTimeScale(scale); };
         api["setSimulationTimeScale"] = [context, timeManager](const FiniteFloat scale) {
             context.mLuaManager->addAction([scale, timeManager] { timeManager->setSimulationTimeScale(scale); });
         };