Add checks for empty domain

nivi-apple · Mar 19, 2024 · 502082e · 502082e
1 parent 9ea1ed0
commit 502082e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/platform/Darwin/DnssdContexts.cpp b/src/platform/Darwin/DnssdContexts.cpp
@@ -705,7 +705,14 @@ void ResolveContext::OnNewInterface(uint32_t interfaceId, const char * fullname,
     // resolving.
     interface.fullyQualifiedDomainName = hostnameWithDomain;
 
-    std::pair<uint32_t, std::string> interfaceKey = std::make_pair(interfaceId, GetDomainNameFromHostName(hostnameWithDomain));
+    std::string domainFromHostname = GetDomainFromHostName(hostnameWithDomain);
+    if (domainFromHostname.empty())
+    {
+        ChipLogError(Discovery, "Mdns: Domain from hostname is empty");
+        return;
+    }
+
+    std::pair<uint32_t, std::string> interfaceKey = std::make_pair(interfaceId, domainFromHostname);
 
     interfaces.insert(std::make_pair(interfaceKey, std::move(interface)));
 }

diff --git a/src/platform/Darwin/DnssdImpl.cpp b/src/platform/Darwin/DnssdImpl.cpp
@@ -152,7 +152,7 @@ namespace chip {
 namespace Dnssd {
 
 
-std::string GetDomainNameFromHostName(const char * hostname)
+std::string GetDomainFromHostName(const char * hostname)
 {
     if (HostNameHasDomain(hostname, kLocalDot))
     {
@@ -293,7 +293,12 @@ static void OnGetAddrInfo(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t i
     ReturnOnFailure(MdnsContexts::GetInstance().Has(sdCtx));
     LogOnFailure(__func__, err);
 
-    sdCtx->domainName = GetDomainNameFromHostName(hostname);
+    sdCtx->domainName = GetDomainFromHostName(hostname);
+    if (sdCtx->domainName.empty())
+    {
+        ChipLogError(Discovery, "Mdns: Domain name is not set");
+        return;
+    }
     if (kDNSServiceErr_NoError == err)
     {
         std::pair<uint32_t, std::string> key = std::make_pair(interfaceId, sdCtx->domainName);

diff --git a/src/platform/Darwin/DnssdImpl.h b/src/platform/Darwin/DnssdImpl.h
@@ -34,7 +34,7 @@ constexpr char kOpenThreadDot[] = "openthread.thread.home.arpa";
 namespace chip {
 namespace Dnssd {
 
-std::string GetDomainNameFromHostName(const char * hostname);
+std::string GetDomainFromHostName(const char * hostname);
 
 enum class ContextType
 {