Refs #20599: Handle error code before function call

Signed-off-by: cferreiragonz <[email protected]>
eProsima · Mar 7, 2024 · c7be6fe · c7be6fe
1 parent 28ba14d
commit c7be6fe
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
@@ -265,11 +265,15 @@ Locator TCPTransportInterface::remote_endpoint_to_locator(
 {
     Locator locator;
     asio::error_code ec;
-    endpoint_to_locator(channel->remote_endpoint(ec), locator);
+    auto endpoint = channel->local_endpoint(ec);
     if (ec)
     {
         LOCATOR_INVALID(locator);
     }
+    else
+    {
+        endpoint_to_locator(endpoint, locator);
+    }
     return locator;
 }
 
@@ -278,11 +282,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;
 }