From 728038b9b1deb0440e71e539eee8d7696c137841 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Mon, 1 Apr 2024 01:04:58 +0200
Subject: [PATCH] Tier2: fix websocket bug

CWebSocket::ConnContext_s::webSocket can be null, added a check.
---
 src/tier2/websocket.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/tier2/websocket.cpp b/src/tier2/websocket.cpp
index 1c31ff5a..afcd5d13 100644
--- a/src/tier2/websocket.cpp
+++ b/src/tier2/websocket.cpp
@@ -275,7 +275,7 @@ bool CWebSocket::ConnContext_s::Process(const double queryTime)
 //-----------------------------------------------------------------------------
 void CWebSocket::ConnContext_s::SetParams(const ConnParams_s& params)
 {
-	Assert(webSocket);
+	Assert(webSocket, "Can't set parameters on a NULL instance!");
 
 	if (params.timeOut > 0)
 		ProtoWebSocketControl(webSocket, 'time', params.timeOut, 0, NULL);
@@ -292,11 +292,15 @@ void CWebSocket::ConnContext_s::SetParams(const ConnParams_s& params)
 //-----------------------------------------------------------------------------
 void CWebSocket::ConnContext_s::Disconnect()
 {
-	ProtoWebSocketDisconnect(webSocket);
-	ProtoWebSocketUpdate(webSocket);
-	ProtoWebSocketDestroy(webSocket);
+	if (webSocket)
+	{
+		ProtoWebSocketDisconnect(webSocket);
+		ProtoWebSocketUpdate(webSocket);
+		ProtoWebSocketDestroy(webSocket);
+
+		webSocket = nullptr;
+	}
 
-	webSocket = nullptr;
 	state = CS_UNAVAIL;
 }