Prevent insertion of null clients in client list

There was a null dereference on a call of member function Client::sendOrQueueWill(). Null clients shouldn exist in the list and this was the only place it could have come from. But, I never got proof.

Prevent insertion of null clients in client list
There was a null dereference on a call of member function Client::sendOrQueueWill(). Null clients shouldn exist in the list and this was the only place it could have come from. But, I never got proof.
Wiebe Cazemier
1 parent e27053fa
Showing 1 changed file with 7 additions and 1 deletions
threaddata.cpp
@@ -294,7 +294,13 @@ void ThreadData::giveClient(std::shared_ptr&lt;Client&gt; client)
 std::shared_ptr<Client> ThreadData::getClient(int fd)
 {
     std::lock_guard<std::mutex> lck(clients_by_fd_mutex);
-    return this->clients_by_fd[fd];
+
+    auto pos = clients_by_fd.find(fd);
+
+    if (pos == clients_by_fd.end())
+        return std::shared_ptr<Client>();
+
+    return pos->second;
 }
  
 void ThreadData::removeClientQueued(const std::shared_ptr<Client> &client)