Merge pull request #1036 from bugsnag/nickdowell/fix-stackframes-with…

…-callstacksymbols Fix parsing of `callStackSymbols` where the image name contains spaces
bugsnag · Mar 16, 2021 · ad62d89 · ad62d89
2 parents c9492d2 + 24c4f30
commit ad62d89
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Bugsnag/Payload/BugsnagStackframe.m b/Bugsnag/Payload/BugsnagStackframe.m
@@ -120,7 +120,7 @@ + (BugsnagStackframe *)frameFromDict:(NSDictionary *)dict
 + (NSArray<BugsnagStackframe *> *)stackframesWithCallStackSymbols:(NSArray<NSString *> *)callStackSymbols {
     NSString *pattern = (@"^(\\d+)"             // Capture the leading frame number
                          @" +"                  // Skip whitespace
-                         @"(\\S+)"              // Image name
+                         @"([\\S ]+?)"          // Image name (may contain spaces)
                          @" +"                  // Skip whitespace
                          @"(0x[0-9a-fA-F]+)"    // Capture the frame address
                          @"("                   // Start optional group

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## TBD
+
+### Bug fixes
+
+* Fix parsing of `callStackSymbols` where the image name contains spaces.
+  [#1036](https://github.com/bugsnag/bugsnag-cocoa/pull/1036)
+
 ## 6.7.1 (2021-03-10)
 
 ### Bug fixes

diff --git a/Tests/BugsnagStackframeTest.m b/Tests/BugsnagStackframeTest.m
@@ -170,7 +170,7 @@ - (void)testDummyCallStackSymbols {
         @"4   CoreFoundation                      0x00007fff23e41fd1",
         @"5   CoreFoundation                      0x00007fff23e422a4",
         @"6   ReactNativeTest                     0x000000010fd76eae",
-        @"7   ReactNativeTest                     0x000000010fd79138"]];
+        @"7   ReactNative App                     0x000000010fd79138"]];
 
     AssertStackframeValues(stackframes[0], @"ReactNativeTest",  0x000000010fda7f1b, @"0x000000010fda7f1b");
     AssertStackframeValues(stackframes[1], @"ReactNativeTest",  0x000000010fd76897, @"0x000000010fd76897");
@@ -179,7 +179,7 @@ - (void)testDummyCallStackSymbols {
     AssertStackframeValues(stackframes[4], @"CoreFoundation",   0x00007fff23e41fd1, @"0x00007fff23e41fd1");
     AssertStackframeValues(stackframes[5], @"CoreFoundation",   0x00007fff23e422a4, @"0x00007fff23e422a4");
     AssertStackframeValues(stackframes[6], @"ReactNativeTest",  0x000000010fd76eae, @"0x000000010fd76eae");
-    AssertStackframeValues(stackframes[7], @"ReactNativeTest",  0x000000010fd79138, @"0x000000010fd79138");
+    AssertStackframeValues(stackframes[7], @"ReactNative App",  0x000000010fd79138, @"0x000000010fd79138");
 }
 
 - (void)testRealCallStackSymbols {