Protect asio exception hotfix (#4527)

* Refs #20599: Handle error code before function call Signed-off-by: cferreiragonz <[email protected]> * Apply suggestion Co-authored-by: Miguel Company <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> Co-authored-by: Miguel Company <[email protected]> (cherry picked from commit 08193d5)
eProsima · Mar 8, 2024 · 085d73a · 085d73a
1 parent 7480818
commit 085d73a
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -266,11 +266,15 @@ Locator TCPTransportInterface::remote_endpoint_to_locator(
 {
     Locator locator;
     asio::error_code ec;
-    endpoint_to_locator(channel->remote_endpoint(ec), locator);
+    auto endpoint = channel->remote_endpoint(ec);
     if (ec)
     {
         LOCATOR_INVALID(locator);
     }
+    else
+    {
+        endpoint_to_locator(endpoint, locator);
+    }
     return locator;
 }
 
@@ -279,11 +283,15 @@ Locator TCPTransportInterface::local_endpoint_to_locator(
 {
     Locator locator;
     asio::error_code ec;
-    endpoint_to_locator(channel->local_endpoint(ec), locator);
+    auto endpoint = channel->local_endpoint(ec);
     if (ec)
     {
         LOCATOR_INVALID(locator);
     }
+    else
+    {
+        endpoint_to_locator(endpoint, locator);
+    }
     return locator;
 }