[Core] Check validity of event callbacks before actually calling them. (

#1325)
eclipse-ecal · Jan 25, 2024 · 45254dd · 45254dd
1 parent b5666d5
commit 45254dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ecal/core/src/readwrite/ecal_reader.cpp b/ecal/core/src/readwrite/ecal_reader.cpp
@@ -658,7 +658,7 @@ namespace eCAL
     {
       const std::lock_guard<std::mutex> lock(m_event_callback_map_sync);
       auto iter = m_event_callback_map.find(sub_event_connected);
-      if(iter != m_event_callback_map.end())
+      if (iter != m_event_callback_map.end() && iter->second)
       {
         SSubEventCallbackData data;
         data.type  = sub_event_connected;
@@ -671,7 +671,7 @@ namespace eCAL
     {
       const std::lock_guard<std::mutex> lock(m_event_callback_map_sync);
       auto iter = m_event_callback_map.find(sub_event_disconnected);
-      if(iter != m_event_callback_map.end())
+      if (iter != m_event_callback_map.end() && iter->second)
       {
         SSubEventCallbackData data;
         data.type  = sub_event_disconnected;
@@ -785,7 +785,7 @@ namespace eCAL
       {
         std::lock_guard<std::mutex> lock(m_event_callback_map_sync);
         auto iter = m_event_callback_map.find(sub_event_timeout);
-        if(iter != m_event_callback_map.end())
+        if(iter != m_event_callback_map.end() && iter->second)
         {
           SSubEventCallbackData data;
           data.type  = sub_event_timeout;

diff --git a/ecal/core/src/readwrite/ecal_writer.cpp b/ecal/core/src/readwrite/ecal_writer.cpp
@@ -984,7 +984,7 @@ namespace eCAL
     {
       const std::lock_guard<std::mutex> lock(m_event_callback_map_sync);
       auto iter = m_event_callback_map.find(pub_event_connected);
-      if (iter != m_event_callback_map.end())
+      if (iter != m_event_callback_map.end() && iter->second)
       {
         SPubEventCallbackData data;
         data.type  = pub_event_connected;
@@ -997,7 +997,7 @@ namespace eCAL
     {
       const std::lock_guard<std::mutex> lock(m_event_callback_map_sync);
       auto iter = m_event_callback_map.find(pub_event_disconnected);
-      if (iter != m_event_callback_map.end())
+      if (iter != m_event_callback_map.end() && iter->second)
       {
         SPubEventCallbackData data;
         data.type  = pub_event_disconnected;