From 57a38aeb94d8e227a9da88fe80e9b4e244efe7fc Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Sat, 2 Jul 2022 00:31:27 +0200
Subject: [PATCH] Potentially more secure version for mod loading.

---
 .../Loader/ResourceLoader.Replacement.cs       | 18 +++++++++++-------
 Penumbra/UI/ConfigWindow.DebugTab.cs           |  1 -
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Penumbra/Interop/Loader/ResourceLoader.Replacement.cs b/Penumbra/Interop/Loader/ResourceLoader.Replacement.cs
index cbbcb3c4..0f990fc3 100644
--- a/Penumbra/Interop/Loader/ResourceLoader.Replacement.cs
+++ b/Penumbra/Interop/Loader/ResourceLoader.Replacement.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -114,7 +116,7 @@ public unsafe partial class ResourceLoader
     // Try all resolve path subscribers or use the default replacer.
     private (FullPath?, object?) ResolvePath( Utf8GamePath path, ResourceCategory category, ResourceType resourceType, int resourceHash )
     {
-        if( !DoReplacements || _isInIncRef > 0 )
+        if( !DoReplacements || _incMode.Value )
         {
             return ( null, null );
         }
@@ -270,17 +272,19 @@ public unsafe partial class ResourceLoader
     // This means, that if the path determined from that is different than the resources path,
     // a different resource gets loaded or incremented, while the IncRef'd resource stays at 0.
     // This causes some problems and is hopefully prevented with this.
-    private int _isInIncRef = 0;
-    public int IsInIncRef
-        => _isInIncRef;
-
+    private readonly ThreadLocal< bool >              _incMode = new();
     private readonly Hook< ResourceHandleDestructor > _incRefHook;
 
     private IntPtr ResourceHandleIncRefDetour( ResourceHandle* handle )
     {
-        Interlocked.Increment(ref _isInIncRef);
+        if( handle->RefCount > 0 )
+        {
+            return _incRefHook.Original( handle );
+        }
+
+        _incMode.Value = true;
         var ret = _incRefHook.Original( handle );
-        Interlocked.Decrement(ref _isInIncRef);
+        _incMode.Value = false;
         return ret;
     }
 }
\ No newline at end of file
diff --git a/Penumbra/UI/ConfigWindow.DebugTab.cs b/Penumbra/UI/ConfigWindow.DebugTab.cs
index 806fbf94..612fb69e 100644
--- a/Penumbra/UI/ConfigWindow.DebugTab.cs
+++ b/Penumbra/UI/ConfigWindow.DebugTab.cs
@@ -153,7 +153,6 @@ public partial class ConfigWindow
                 return;
             }
 
-            ImGui.TextUnformatted( $"In Increment RefCounter Mode: {Penumbra.ResourceLoader.IsInIncRef}" );
             using var drawTree = ImRaii.TreeNode( "Draw Object to Object" );
             if( drawTree )
             {