fix: use-after-free issue in lua_unreal_script_function_hook_post

narknon · narknon · commit f969c3385674 · 2025-12-03T12:21:49.000-05:00
diff --git a/UE4SS/src/Mod/LuaMod.cpp b/UE4SS/src/Mod/LuaMod.cpp
@@ -400,6 +400,10 @@ namespace RC
         process_return_value();
         process_return_value();
 
+        // No longer promising to be in the game thread
+        // Must be done before cleanup since cleanup deletes lua_data
+        set_is_in_game_thread(lua_data.lua, false);
+
         if (lua_data.scheduled_for_removal)
         {
             auto native_hook_post_id_it = LuaMod::m_generic_hook_id_to_native_hook_id.find(lua_data.post_callback_id);
@@ -418,9 +422,6 @@ namespace RC
                 return elem.get() == &lua_data;
             });
         }
-
-        // No longer promising to be in the game thread
-        set_is_in_game_thread(lua_data.lua, false);
     }
 
     static auto register_input_globals(const LuaMadeSimple::Lua& lua) -> void

Original file line number	Diff line number	Diff line change
`@@ -400,6 +400,10 @@ namespace RC`
`400`	`400`	`process_return_value();`
`401`	`401`	`process_return_value();`
`402`	`402`
	`403`	`+ // No longer promising to be in the game thread`
	`404`	`+ // Must be done before cleanup since cleanup deletes lua_data`
	`405`	`+ set_is_in_game_thread(lua_data.lua, false);`
	`406`	`+`
`403`	`407`	`if (lua_data.scheduled_for_removal)`
`404`	`408`	`{`
`405`	`409`	`auto native_hook_post_id_it = LuaMod::m_generic_hook_id_to_native_hook_id.find(lua_data.post_callback_id);`
`@@ -418,9 +422,6 @@ namespace RC`
`418`	`422`	`return elem.get() == &lua_data;`
`419`	`423`	`});`
`420`	`424`	`}`
`421`		`-`
`422`		`- // No longer promising to be in the game thread`
`423`		`- set_is_in_game_thread(lua_data.lua, false);`
`424`	`425`	`}`
`425`	`426`
`426`	`427`	`static auto register_input_globals(const LuaMadeSimple::Lua& lua) -> void`