Merge pull request #1632 from bugsnag/PLAT-11642-bugsnagsessiontracke…

…r-race-condition [PLAT-11642] BugsnagSessionTracker race condition
bugsnag · Feb 27, 2024 · 920af29 · 920af29
2 parents 8f9733c + a4cc872
commit 920af29
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/Bugsnag/BugsnagSessionTracker.m b/Bugsnag/BugsnagSessionTracker.m
@@ -166,7 +166,9 @@ - (void)startNewSession {
                                              config:self.config
                                        codeBundleId:self.codeBundleId];
     BugsnagDevice *device = [BugsnagDevice deviceWithKSCrashReport:@{@"system": systemInfo}];
-    [device appendRuntimeInfo:self.extraRuntimeInfo];
+    @synchronized (self.extraRuntimeInfo) {
+        [device appendRuntimeInfo:self.extraRuntimeInfo];
+    }
 
     BugsnagSession *newSession = [[BugsnagSession alloc] initWithId:[[NSUUID UUID] UUIDString]
                                                           startedAt:[NSDate date]
@@ -194,7 +196,9 @@ - (void)startNewSession {
 - (void)addRuntimeVersionInfo:(NSString *)info
                       withKey:(NSString *)key {
     if (info != nil && key != nil) {
-        self.extraRuntimeInfo[key] = info;
+        @synchronized (self.extraRuntimeInfo) {
+            self.extraRuntimeInfo[key] = info;
+        }
     }
 }
 

diff --git a/Tests/BugsnagTests/BugsnagSessionTrackerTest.m b/Tests/BugsnagTests/BugsnagSessionTrackerTest.m
@@ -170,4 +170,31 @@ - (void)testStartInForeground {
     XCTAssertNotNil(self.sessionTracker.runningSession, @"There should be a running session after starting tracker in foreground");
 }
 
+- (void)testMultithreadedAddRuntimeVersionInfo {
+    NSCondition *endCondition = [NSCondition new];
+    __block int runningThreads = 0;
+    BugsnagConfiguration *config = nil;
+    BugsnagSessionTracker *sessionTracker = [[BugsnagSessionTracker alloc] initWithConfig:config client:nil];
+
+    for (int i = 0; i < 100; i++) {
+        NSString *info = [NSString stringWithFormat:@"Info %d", i];
+        NSString *key = [NSString stringWithFormat:@"Key %d", i];
+        NSThread *thread = [[NSThread alloc] initWithBlock:^{
+            runningThreads++;
+            for(int j = 0; j < 10000; j++) {
+                [sessionTracker addRuntimeVersionInfo:info withKey:key];
+            }
+            if (--runningThreads <= 0) {
+                [endCondition signal];
+            }
+        }];
+        [thread start];
+    }
+
+    [NSThread sleepForTimeInterval:0.1];
+    while (runningThreads > 0) {
+        [endCondition wait];
+    }
+}
+
 @end