From 1fa7445667d51cb7e76200a7d830276e69a5f6e4 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Fri, 20 Oct 2023 23:25:05 -0700
Subject: [PATCH] [ntcore] Check for valid client in incoming text and binary
 (#5799)

---
 ntcore/src/main/native/cpp/net/ServerImpl.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ntcore/src/main/native/cpp/net/ServerImpl.cpp b/ntcore/src/main/native/cpp/net/ServerImpl.cpp
index 5f3a298428..111980918a 100644
--- a/ntcore/src/main/native/cpp/net/ServerImpl.cpp
+++ b/ntcore/src/main/native/cpp/net/ServerImpl.cpp
@@ -1887,12 +1887,16 @@ void ServerImpl::SetLocal(LocalInterface* local) {
 }
 
 void ServerImpl::ProcessIncomingText(int clientId, std::string_view data) {
-  m_clients[clientId]->ProcessIncomingText(data);
+  if (auto client = m_clients[clientId].get()) {
+    client->ProcessIncomingText(data);
+  }
 }
 
 void ServerImpl::ProcessIncomingBinary(int clientId,
                                        std::span<const uint8_t> data) {
-  m_clients[clientId]->ProcessIncomingBinary(data);
+  if (auto client = m_clients[clientId].get()) {
+    client->ProcessIncomingBinary(data);
+  }
 }
 
 void ServerImpl::ConnectionsChanged(const std::vector<ConnectionInfo>& conns) {