From 744f45cc886210ee95404ea659fd0327f818e891 Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Fri, 1 Nov 2024 18:13:13 -0700
Subject: [PATCH] Fixing crash (#36343)

---
 src/darwin/Framework/CHIP/MTRDeviceConnectivityMonitor.mm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/darwin/Framework/CHIP/MTRDeviceConnectivityMonitor.mm b/src/darwin/Framework/CHIP/MTRDeviceConnectivityMonitor.mm
index 6a9ac601d41b6f..530d608fd63b29 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceConnectivityMonitor.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceConnectivityMonitor.mm
@@ -120,6 +120,10 @@ - (void)handleResolvedHostname:(const char *)hostName port:(uint16_t)port error:
 {
     std::lock_guard lock(sConnectivityMonitorLock);
 
+    if (hostName == NULL) {
+        MTR_LOG_ERROR("%@ NULL host resolved, ignoring", self);
+        return;
+    }
     // dns_sd.h: must check and call deallocate if error is kDNSServiceErr_ServiceNotRunning
     if (error == kDNSServiceErr_ServiceNotRunning) {
         MTR_LOG_ERROR("%@ disconnected from dns-sd subsystem", self);