Fixed stackoverflow caused by ParseDerived due to GetDerivedNonAbstra…

…ct not returning abstract types
evilfactory · Mar 29, 2024 · 7dc75c6 · 7dc75c6
1 parent ee337e4
commit 7dc75c6
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Libraries/BarotraumaLibs/BarotraumaCore/Utils/ReflectionUtils.cs b/Libraries/BarotraumaLibs/BarotraumaCore/Utils/ReflectionUtils.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using Barotrauma.Debugging;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -55,7 +56,13 @@ public static IEnumerable<Type> GetDerivedNonAbstract<T>()
             if (list.Length == 0)
             {
                 return ImmutableArray<Type>.Empty;    // No types, don't add to cache
-            }            
+            }
+
+            if (!TypeSearchCache.TryAdd(typeName, list))
+            {
+                DebugConsoleCore.Log($"ReflectionUtils.AddNonAbstractAssemblyTypes(): Error while adding to quick lookup cache.");
+            }
+
             return list;
         }
 
@@ -107,7 +114,7 @@ public static void RemoveAssemblyFromCache(Assembly assembly)
         public static void ResetCache()
         {
             CachedNonAbstractTypes.Clear();
-            CachedNonAbstractTypes.TryAdd(typeof(ReflectionUtils).Assembly, typeof(ReflectionUtils).Assembly.GetTypes().ToImmutableArray());
+            CachedNonAbstractTypes.TryAdd(typeof(ReflectionUtils).Assembly, typeof(ReflectionUtils).Assembly.GetTypes().Where(t => !t.IsAbstract).ToImmutableArray());
             TypeSearchCache.Clear();
         }