Deal with empty session for early client disconnect

Wiebe Cazemier
1 parent 80cad8fe
Showing 2 changed files with 4 additions and 1 deletions
client.cpp
subscriptionstore.cpp
@@ -69,7 +69,7 @@ Client::~Client()
         close(fd);
     }
  
-    if (session->getDestroyOnDisconnect())
+    if (session && session->getDestroyOnDisconnect())
     {
         store->removeSession(session);
     }
@@ -634,6 +634,9 @@ void SubscriptionStore::removeExpiredSessionsClients()
  
 void SubscriptionStore::queueSessionRemoval(const std::shared_ptr<Session> &session)
 {
+    if (!session)
+        return;
+
     QueuedSessionRemoval qsr(session);
  
     auto comp = [](const QueuedSessionRemoval &a, const QueuedSessionRemoval &b)