[darwin] Data race when accessing onConnectionComplete (#25487)

project-chip · Oct 25, 2023 · 1094162 · 1094162
1 parent 91772b0
commit 1094162
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/platform/Darwin/BleConnectionDelegateImpl.mm b/src/platform/Darwin/BleConnectionDelegateImpl.mm
@@ -182,23 +182,19 @@ - (void)resetTimer
 // All our callback dispatch must happen on _chipWorkQueue
 - (void)dispatchConnectionError:(CHIP_ERROR)error
 {
-    if (self.onConnectionError == nil) {
-        return;
-    }
-
     dispatch_async(_chipWorkQueue, ^{
-        self.onConnectionError(self.appState, error);
+        if (self.onConnectionError != nil) {
+            self.onConnectionError(self.appState, error);
+        }
     });
 }
 
 - (void)dispatchConnectionComplete:(CBPeripheral *)peripheral
 {
-    if (self.onConnectionComplete == nil) {
-        return;
-    }
-
     dispatch_async(_chipWorkQueue, ^{
-        self.onConnectionComplete(self.appState, (__bridge void *) peripheral);
+        if (self.onConnectionComplete != nil) {
+            self.onConnectionComplete(self.appState, (__bridge void *) peripheral);
+        }
     });
 }