More checks in Connection class

dkargin · Nov 30, 2024 · a901533 · a901533
1 parent aa0f0a0
commit a901533
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/include/miniros/internal/observer.h b/include/miniros/internal/observer.h
@@ -1,6 +1,7 @@
 #ifndef MINIROS_OBSERVER_H
 #define MINIROS_OBSERVER_H
 
+#include <cassert>
 #include <type_traits> // for std::is_base_of
 
 namespace miniros {
@@ -98,6 +99,15 @@ class Iterator {
         return *m_obj;
     }
 
+    operator bool () const {
+        return m_obj != nullptr;
+    }
+
+    ConnectionImpl* operator -> () {
+        assert(m_obj);
+        return m_obj;
+    }
+
 protected:
     ConnectionImpl* m_obj;
 };

diff --git a/src/transport/connection.cpp b/src/transport/connection.cpp
@@ -357,8 +357,9 @@ void Connection::drop(DropReason reason)
         std::scoped_lock<DropWatchers> lock(drop_watchers_);
         for (auto it = drop_watchers_.begin(); it != drop_watchers_.end(); it++)
         {
-            DropWatcher& watcher = *it;
-            watcher.onConnectionDropped(shared_from_this(), reason);
+            if (!it)
+              continue;
+            it->onConnectionDropped(shared_from_this(), reason);
         }
     }
     transport_->close();