fix: Crash with screenshot is reported twice (#2134)

Fix a bug where crashes with screenshots were reported twice.
getsentry · Sep 9, 2022 · 45ed684 · 45ed684
1 parent 28016b4
commit 45ed684
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Fixes
 
 - Can't find app image when swizzling (#2124)
+- Crash with screenshot is reported twice (#2134)
 
 ## 7.24.1
 

diff --git a/Sources/SentryCrash/Recording/SentryCrashReportStore.c b/Sources/SentryCrash/Recording/SentryCrashReportStore.c
@@ -107,7 +107,7 @@ getReportCount()
     }
     struct dirent *ent;
     while ((ent = readdir(dir)) != NULL) {
-        if (getReportIDFromFilename(ent->d_name) > 0) {
+        if (ent->d_type != DT_DIR && getReportIDFromFilename(ent->d_name) > 0) {
             count++;
         }
     }

diff --git a/Tests/SentryTests/SentryCrash/SentryCrashReportStore_Tests.m b/Tests/SentryTests/SentryCrash/SentryCrashReportStore_Tests.m
@@ -149,6 +149,26 @@ - (void)testCrashReportCount1
     [self expectHasReportCount:1];
 }
 
+- (void)testCrashReportCount1_WithAttachments
+{
+    [self prepareReportStoreWithPathEnd:@"testCrashReportCount1"];
+    NSString *reportContents = @"Testing";
+
+    char crashReportPath[SentryCrashCRS_MAX_PATH_LENGTH];
+    sentrycrashcrs_getNextCrashReportPath(crashReportPath);
+    NSString *pathToCrashReport = [NSString stringWithUTF8String:crashReportPath];
+    NSError *someError;
+    [NSFileManager.defaultManager
+              createDirectoryAtPath:[pathToCrashReport stringByDeletingPathExtension]
+        withIntermediateDirectories:true
+                         attributes:nil
+                              error:&someError];
+    XCTAssertNil(someError);
+
+    [self writeCrashReportWithStringContents:reportContents];
+    [self expectHasReportCount:1];
+}
+
 - (void)testStoresLoadsOneCrashReport
 {
     [self prepareReportStoreWithPathEnd:@"testStoresLoadsOneCrashReport"];