fix setfenv applied on invalid code strings

Open-Hexagon · Jun 22, 2024 · 8583381 · 8583381
1 parent 467b8dd
commit 8583381
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/compat/game192/lua_runtime.lua b/compat/game192/lua_runtime.lua
@@ -178,7 +178,9 @@ function lua_runtime.init_env(game, public)
         tostring = tostring,
         loadstring = function(...)
             local f = loadstring(...)
-            setfenv(f, lua_runtime.env)
+            if f then
+                setfenv(f, lua_runtime.env)
+            end
             return f
         end,
         io = vfs.io,

diff --git a/compat/game20/lua_runtime.lua b/compat/game20/lua_runtime.lua
@@ -163,7 +163,9 @@ function lua_runtime.init_env(game, public, assets)
         tostring = tostring,
         load = function(...)
             local f = load(...)
-            setfenv(f, lua_runtime.env)
+            if f then
+                setfenv(f, lua_runtime.env)
+            end
             return f
         end,
     }

diff --git a/compat/game21/custom_timelines.lua b/compat/game21/custom_timelines.lua
@@ -36,8 +36,10 @@ function custom_timelines.add_lua_functions(game)
     function lua.ct_eval(handle, code)
         local timeline = custom_timelines.get(handle)
         local fn = loadstring(code)
-        setfenv(fn, lua_runtime.env)
-        timeline:append_do(fn)
+        if fn then
+            setfenv(fn, lua_runtime.env)
+            timeline:append_do(fn)
+        end
     end
 
     function lua.ct_kill(handle)

diff --git a/compat/game21/lua_runtime/init.lua b/compat/game21/lua_runtime/init.lua
@@ -52,7 +52,9 @@ function lua_runtime.init_env(game, public)
         tostring = tostring,
         load = function(...)
             local f = load(...)
-            setfenv(f, lua_runtime.env)
+            if f then
+                setfenv(f, lua_runtime.env)
+            end
             return f
         end,
     }

diff --git a/compat/game21/lua_runtime/timelines.lua b/compat/game21/lua_runtime/timelines.lua
@@ -9,8 +9,10 @@ return function(public, game)
     -- Main timeline functions
     env.t_eval = function(code)
         local fn = loadstring(code)
-        setfenv(fn, env)
-        game.main_timeline:append_do(fn)
+        if fn then
+            setfenv(fn, env)
+            game.main_timeline:append_do(fn)
+        end
     end
     env.t_clear = function()
         game.main_timeline:clear(true)
@@ -35,8 +37,10 @@ return function(public, game)
     -- Event timeline functions
     env.e_eval = function(code)
         local fn = loadstring(code)
-        setfenv(fn, env)
-        game.event_timeline:append_do(fn)
+        if fn then
+            setfenv(fn, env)
+            game.event_timeline:append_do(fn)
+        end
     end
     env.e_kill = function()
         game.event_timeline:append_do(function()