Fixed potential infinite recursion ISyncSimple crashes

rwmt · Feb 22, 2024 · 5fa1ffc · 5fa1ffc
1 parent 84cc383
commit 5fa1ffc
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/Source/Client/Syncing/SyncSerialization.cs b/Source/Client/Syncing/SyncSerialization.cs
@@ -15,6 +15,8 @@ namespace Multiplayer.Client
 {
     public static class SyncSerialization
     {
+        private static bool simplifiedSyncSimpleCheck = false;
+
         public static void Init()
         {
             RwImplSerialization.Init();
@@ -52,10 +54,24 @@ public static bool CanHandle(SyncType syncType)
                     || typeof(ITuple).IsAssignableFrom(gtd))
                     && CanHandleGenericArgs(type);
             if (typeof(ISyncSimple).IsAssignableFrom(type))
-                return ImplSerialization.syncSimples.
-                    Where(t => type.IsAssignableFrom(t)).
-                    SelectMany(AccessTools.GetDeclaredFields).
-                    All(f => CanHandle(f.FieldType));
+            {
+                // Prevent infinite recursive calls to CanHandle on ISyncSimple subtypes.
+                if (simplifiedSyncSimpleCheck)
+                    return true;
+
+                try
+                {
+                    simplifiedSyncSimpleCheck = true;
+                    return ImplSerialization.syncSimples.
+                        Where(t => type.IsAssignableFrom(t)).
+                        SelectMany(AccessTools.GetDeclaredFields).
+                        All(f => CanHandle(f.FieldType));
+                }
+                finally
+                {
+                    simplifiedSyncSimpleCheck = false;
+                }
+            }
             if (typeof(Def).IsAssignableFrom(type))
                 return true;
             if (typeof(Designator).IsAssignableFrom(type))