galaxy: add cycle guard to HasMatchingDescendant

2026-05-28 15:30:08 -04:00
parent 1a1d14a9fd
commit f0ec068430
2 changed files with 83 additions and 2 deletions
@@ -163,10 +163,17 @@ public static class GalaxyBrowseProjector
            return false;
        }

+        // Defend against pathological cycles in Galaxy data (e.g. a corrupt A→B→A chain).
+        // BuildContainedPath uses the same visited-id pattern; mirror it so this walk
+        // terminates even when ChildrenByParent forms a cycle.
+        HashSet<int> visited = new() { parent.Object.GobjectId };
        Stack<GalaxyObjectView> stack = new();
        foreach (GalaxyObjectView child in children)
        {
-            stack.Push(child);
+            if (visited.Add(child.Object.GobjectId))
+            {
+                stack.Push(child);
+            }
        }
        while (stack.Count > 0)
        {
@@ -180,7 +187,10 @@ public static class GalaxyBrowseProjector
            {
                foreach (GalaxyObjectView grandchild in grandchildren)
                {
-                    stack.Push(grandchild);
+                    if (visited.Add(grandchild.Object.GobjectId))
+                    {
+                        stack.Push(grandchild);
+                    }
                }
            }
        }