Fix github issue #14321 - Thread end device (Requestor) crashes if it…

… cannot reach the Provider (#14712) * Fix github issue #14321 * Updates from PR suggestions * Restyled by whitespace * Restyled by clang-format * Add verify or die calls to Discovery_ImplPlatform.cpp Co-authored-by: Restyled.io <[email protected]>
project-chip · Feb 7, 2022 · c7f7244 · c7f7244
1 parent 56be65c
commit c7f7244
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.cpp b/src/lib/dnssd/Discovery_ImplPlatform.cpp
@@ -83,22 +83,31 @@ static void HandleNodeIdResolve(void * context, DnssdService * result, CHIP_ERRO
     {
         proxy->OnNodeIdResolutionFailed(PeerId(), error);
         proxy->Release();
+        return;
     }
 
+    VerifyOrDie(proxy != nullptr);
+
     if (result == nullptr)
     {
         proxy->OnNodeIdResolutionFailed(PeerId(), CHIP_ERROR_UNKNOWN_RESOURCE_ID);
         proxy->Release();
+        return;
     }
 
+    VerifyOrDie(proxy != nullptr);
+
     PeerId peerId;
     error = ExtractIdFromInstanceName(result->mName, &peerId);
     if (CHIP_NO_ERROR != error)
     {
         proxy->OnNodeIdResolutionFailed(PeerId(), error);
         proxy->Release();
+        return;
     }
 
+    VerifyOrDie(proxy != nullptr);
+
     ResolvedNodeData nodeData;
     Platform::CopyString(nodeData.mHostName, result->mHostName);
     nodeData.mInterfaceId = result->mInterface;