Fix: Don't run onCrashedLastSession for nil Events (#3785)

brustolin · web-flow · commit db533eee834d · 2024-03-26T08:45:54.000+01:00
Don't run onCrashedLastSession for nil Events. This could happen if beforeSend returns nil
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Don't run onCrashedLastSession for nil Events (#3785)
+
 ## 8.22.4
 
 ### Fixes
diff --git a/Sources/Sentry/SentryClient.m b/Sources/Sentry/SentryClient.m
@@ -664,7 +664,8 @@ - (SentryEvent *_Nullable)prepareEvent:(SentryEvent *)event
         }
     }
 
-    if (isCrashEvent && nil != self.options.onCrashedLastRun && !SentrySDK.crashedLastRunCalled) {
+    if (event != nil && isCrashEvent && nil != self.options.onCrashedLastRun
+        && !SentrySDK.crashedLastRunCalled) {
         // We only want to call the callback once. It can occur that multiple crash events are
         // about to be sent.
         SentrySDK.crashedLastRunCalled = YES;
diff --git a/Tests/SentryTests/SentryClientTests.swift b/Tests/SentryTests/SentryClientTests.swift
@@ -1444,6 +1444,22 @@ class SentryClientTest: XCTestCase {
         XCTAssertTrue(onCrashedLastRunCalled)
     }
     
+    func testOnCrashedLastRun_DontRunIfBeforeSendReturnsNill() {
+        let event = TestData.event
+        
+        var onCrashedLastRunCalled = false
+        fixture.getSut(configureOptions: { options in
+            options.beforeSend = { _ in
+                return nil
+            }
+            options.onCrashedLastRun = { _ in
+                onCrashedLastRunCalled = true
+            }
+        }).captureCrash(event, with: fixture.session, with: fixture.scope)
+        
+        XCTAssertFalse(onCrashedLastRunCalled)
+    }
+    
     func testOnCrashedLastRun_WithTwoCrashes_OnlyInvokeCallbackOnce() {
         let event = TestData.event
         

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,8 @@ - (SentryEvent _Nullable)prepareEvent:(SentryEvent )event`
`664`	`664`	`}`
`665`	`665`	`}`
`666`	`666`
`667`		`- if (isCrashEvent && nil != self.options.onCrashedLastRun && !SentrySDK.crashedLastRunCalled) {`
	`667`	`+ if (event != nil && isCrashEvent && nil != self.options.onCrashedLastRun`
	`668`	`+ && !SentrySDK.crashedLastRunCalled) {`
`668`	`669`	`// We only want to call the callback once. It can occur that multiple crash events are`
`669`	`670`	`// about to be sent.`
`670`	`671`	`SentrySDK.crashedLastRunCalled = YES;`