Changed enumeration to be safer

jtung-apple · Sep 7, 2024 · afef79f · afef79f
1 parent 88d1bed
commit afef79f
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -362,9 +362,16 @@ - (void)suspend
     @synchronized (self) {
         _suspended = YES;
 
-        std::lock_guard lock(*self.deviceMapLock);
-        NSEnumerator * devices = [self.nodeIDToDeviceMap objectEnumerator];
-        for (MTRDevice * device in devices) {
+        NSMutableArray *devicesToSuspend = [NSMutableArray array];
+        {
+            std::lock_guard lock(*self.deviceMapLock);
+            NSEnumerator * devices = [self.nodeIDToDeviceMap objectEnumerator];
+            for (MTRDevice * device in devices) {
+                [devicesToSuspend addObject:device];
+            }
+        }
+
+        for (MTRDevice * device in devicesToSuspend) {
             [device controllerSuspended];
         }
 
@@ -383,9 +390,16 @@ - (void)resume
     @synchronized (self) {
         _suspended = NO;
 
-        std::lock_guard lock(*self.deviceMapLock);
-        NSEnumerator * devices = [self.nodeIDToDeviceMap objectEnumerator];
-        for (MTRDevice * device in devices) {
+        NSMutableArray *devicesToResume = [NSMutableArray array];
+        {
+            std::lock_guard lock(*self.deviceMapLock);
+            NSEnumerator * devices = [self.nodeIDToDeviceMap objectEnumerator];
+            for (MTRDevice * device in devices) {
+                [devicesToResume addObject:device];
+            }
+        }
+
+        for (MTRDevice * device in devicesToResume) {
             [device controllerResumed];
         }
     }