check the error failures #2

abtink · Sep 3, 2023 · adc2739 · adc2739
1 parent 5c2f6e3
commit adc2739
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/mdns/mdns.cpp b/src/mdns/mdns.cpp
@@ -144,7 +144,7 @@ otbrError Publisher::DecodeTxtData(Publisher::TxtList &aTxtList, const uint8_t *
 
         if (keyEnd == entryEnd)
         {
-            if (keyEnd > keyStart)
+            //if (keyEnd > keyStart) // CAUSE FAILURE
             {
                 // No `=`, treat as a boolean attribute.
                 aTxtList.emplace_back(reinterpret_cast<const char *>(&aTxtData[keyStart]), keyEnd - keyStart);

diff --git a/src/sdp_proxy/advertising_proxy.cpp b/src/sdp_proxy/advertising_proxy.cpp
@@ -232,7 +232,16 @@ otbrError AdvertisingProxy::PublishHostAndItsServices(const otSrpServerHost *aHo
     const otSrpServerService  *service;
     otSrpServerServiceUpdateId updateId     = 0;
     bool                       hasUpdate    = false;
-    std::string                fullHostName = otSrpServerHostGetFullName(aHost);
+    std::string                fullHostName;
+
+    if (otSrpServerHostGetFullName(aHost) == nullptr)
+    {
+        otbrLogWarning("ABTIN ~~~ otSrpServerHostGetFullName() is null WHY?");
+        error = OTBR_ERROR_INVALID_ARGS;
+        ExitNow();
+    }
+
+    fullHostName = otSrpServerHostGetFullName(aHost);
 
     otbrLogInfo("Advertise SRP service updates: host=%s", fullHostName.c_str());
 
@@ -256,11 +265,20 @@ otbrError AdvertisingProxy::PublishHostAndItsServices(const otSrpServerHost *aHo
     service = nullptr;
     while ((service = otSrpServerHostGetNextService(aHost, service)) != nullptr)
     {
-        std::string fullServiceName = otSrpServerServiceGetInstanceName(service);
+        std::string fullServiceName;
         std::string serviceName;
         std::string serviceType;
         std::string serviceDomain;
 
+        if (otSrpServerServiceGetInstanceName(service) == nullptr)
+        {
+            otbrLogWarning("ABTIN ~~~ otSrpServerServiceGetInstanceName() is null WHY?");
+            error = OTBR_ERROR_INVALID_ARGS;
+            ExitNow();
+        }
+
+        fullServiceName = otSrpServerServiceGetInstanceName(service);
+
         SuccessOrExit(error = SplitFullServiceInstanceName(fullServiceName, serviceName, serviceType, serviceDomain));
 
         if (!hostDeleted && !otSrpServerServiceIsDeleted(service))