commit 46b4649a8cb7242b5c7d39c37564b81074a6946f
author Boris Zbarsky <bzbarsky@apple.com> Fri Sep 23 09:44:30 2022 -0400
committer GitHub <noreply@github.com> Fri Sep 23 09:44:30 2022 -0400
tree 572c20a92194d3e6f9f2d5e10139190525d1bc8a
parent 1e3c5fe47c1f9b5e706168ea4ce58bec5e9de916

Make sure to ignore setDeviceControllerDelegate calls on non-running controllers. (#22778)

Otherwise we can end up with null-derefs trying to touch members that
no longer exist.

Fixes https://github.com/project-chip/connectedhomeip/issues/22776

src/darwin/Framework/CHIP/MTRDeviceController.mm

diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
index 43c2d0e..221b473 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -535,7 +535,11 @@
 
 - (void)setDeviceControllerDelegate:(id<MTRDeviceControllerDelegate>)delegate queue:(dispatch_queue_t)queue
 {
+    VerifyOrReturn([self checkIsRunning]);
+
     dispatch_async(_chipWorkQueue, ^{
+        VerifyOrReturn([self checkIsRunning]);
+
         self->_deviceControllerDelegateBridge->setDelegate(self, delegate, queue);
     });
 }