Merge branch 'master' into chef-robotic-vacuum-cleaner-326681447

stingchang · May 13, 2024 · 3008435 · 3008435
2 parents 11b4c03 + 70d9a61
commit 3008435
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceConnectivityMonitor.mm b/src/darwin/Framework/CHIP/MTRDeviceConnectivityMonitor.mm
@@ -271,8 +271,11 @@ - (void)_stopMonitoring
 
 - (void)stopMonitoring
 {
-    MTR_LOG_INFO("%@ stop connectivity monitoring for %@", self, _instanceName);
-    std::lock_guard lock(sConnectivityMonitorLock);
-    [self _stopMonitoring];
+    // DNSServiceRefDeallocate must be called on the same queue set on the shared connection.
+    dispatch_async(sSharedResolverQueue, ^{
+        MTR_LOG_INFO("%@ stop connectivity monitoring for %@", self, self->_instanceName);
+        std::lock_guard lock(sConnectivityMonitorLock);
+        [self _stopMonitoring];
+    });
 }
 @end