[Core] Fix race condition in CSampleSender::Send() #1332 (#1333)

This PR protects the m_payload member variable and thus makes the Send() function reentrant, as it may be called simultaneously from different threads. Co-authored-by: Florian Reimold <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
eclipse-ecal · Jan 24, 2024 · 16acfd2 · 16acfd2
1 parent 3dd14af
commit 16acfd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/ecal/core/src/io/udp/ecal_udp_sample_sender.cpp b/ecal/core/src/io/udp/ecal_udp_sample_sender.cpp
@@ -47,6 +47,7 @@ namespace eCAL
     {
       if (!m_udp_sender) return(0);
 
+      std::lock_guard<std::mutex> const send_lock(m_payload_mutex);
       // return value
       size_t sent_sum(0);
 

diff --git a/ecal/core/src/io/udp/ecal_udp_sample_sender.h b/ecal/core/src/io/udp/ecal_udp_sample_sender.h
@@ -35,6 +35,7 @@
 #endif
 
 #include <memory>
+#include <mutex>
 #include <vector>
 
 namespace eCAL
@@ -51,6 +52,7 @@ namespace eCAL
       IO::UDP::SSenderAttr                 m_attr;
       std::shared_ptr<IO::UDP::CUDPSender> m_udp_sender;
 
+      std::mutex                           m_payload_mutex;
       std::vector<char>                    m_payload;
     };
   }