Correct iterator increment after erasing elements in `connected_serve…

…rs_list` (#5226) * BugFix: Correct iterator increment after erasing elements in connected_servers_ list Signed-off-by: Lucia Echevarria <[email protected]> * Refs #21649. Apply suggested changes Signed-off-by: Lucia Echevarria <[email protected]> --------- Signed-off-by: Lucia Echevarria <[email protected]> (cherry picked from commit d4d8e54) # Conflicts: # src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
eProsima · Sep 13, 2024 · 5a3e0a5 · 5a3e0a5
1 parent f5bca04
commit 5a3e0a5
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
@@ -590,15 +590,25 @@ void PDPClient::removeRemoteEndpoints(
         eprosima::shared_lock<eprosima::shared_mutex> disc_lock(mp_builtin->getDiscoveryMutex());
 
         // Verify if this participant is a server
+<<<<<<< HEAD
         for (auto& svr : mp_builtin->m_DiscoveryServers)
+=======
+        auto it = connected_servers_.begin();
+        while (it != connected_servers_.end())
+>>>>>>> d4d8e5489 (Correct iterator increment after erasing elements in `connected_servers_list` (#5226))
         {
             if (svr.guidPrefix == pdata->m_guid.guidPrefix)
             {
                 std::unique_lock<std::recursive_mutex> lock(*getMutex());
                 svr.is_connected = false;
                 is_server = true;
                 mp_sync->restart_timer(); // enable announcement and sync mechanism till this server reappears
+
+                // Avoid incrementing iterator after item removal
+                continue;
             }
+
+            ++it;
         }
     }