check length of callstack frames before slicing

automerge · May 7, 2024 · 85131a4 · 85131a4
1 parent cf60fe3
commit 85131a4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/Sources/Automerge/BoundTypes/AutomergeText.swift b/Sources/Automerge/BoundTypes/AutomergeText.swift
@@ -399,8 +399,15 @@ extension AutomergeText: ObservableObject {
         if #available(macOS 11, iOS 14, *) {
             let logger = Logger(subsystem: "Automerge", category: "AutomergeText")
             logger.trace("\(self.debugDescription) sending ObjectWillChange")
-            for callStackFrame in Thread.callStackSymbols[0 ... 6] {
-                logger.trace(" - \(callStackFrame)")
+            let callStacks = Thread.callStackSymbols
+            if callStacks.count > 5 {
+                for callStackFrame in callStacks[0 ... 5] {
+                    logger.trace(" - \(callStackFrame)")
+                }
+            } else {
+                for callStackFrame in callStacks {
+                    logger.trace(" - \(callStackFrame)")
+                }
             }
         }
         #endif

diff --git a/Sources/Automerge/Document.swift b/Sources/Automerge/Document.swift
@@ -1065,8 +1065,15 @@ extension Document: ObservableObject {
 //                ch.debugDescription
 //            }.joined(separator: ".")
 //            logger.trace("heads: \(headsString)")
-            for callStackFrame in Thread.callStackSymbols[0 ... 5] {
-                logger.trace(" - \(callStackFrame)")
+            let callStacks = Thread.callStackSymbols
+            if callStacks.count > 5 {
+                for callStackFrame in callStacks[0 ... 5] {
+                    logger.trace(" - \(callStackFrame)")
+                }
+            } else {
+                for callStackFrame in callStacks {
+                    logger.trace(" - \(callStackFrame)")
+                }
             }
         }
         #endif