3 files changed, 11 insertions(+), 1 deletions(-)

M louloulibs/network/dns_socket_handler.cpp
M louloulibs/network/poller.cpp
M louloulibs/network/poller.hpp

@@ 42,7 42,8 @@ bool DNSSocketHandler::is_connected() const
 
 void DNSSocketHandler::remove_from_poller()
 {
-  this->poller->remove_socket_handler(this->socket);
+  if (this->poller->is_managing_socket(this->socket))
+    this->poller->remove_socket_handler(this->socket);
 }
 
 #endif /* CARES_FOUND */

@@ 226,3 226,8 @@ size_t Poller::size() const
 {
   return this->socket_handlers.size();
 }
+
+bool Poller::is_managing_socket(const socket_t socket) const
+{
+  return (this->socket_handlers.find(socket) != this->socket_handlers.end());
+}

@@ 74,6 74,10 @@ public:
    * Returns the number of SocketHandlers managed by the poller.
    */
   size_t size() const;
+  /**
+   * Whether the given socket is managed by the poller
+   */
+   bool is_managing_socket(const socket_t socket) const;
 
 private:
   /**