Lock s_critsect in AbandonConn to be safe

Not completely sure if this is actually necessary, but all other code that uses the abandoned and cancelId fields also holds s_critsect. Currently, all callers of AbandonConn already have s_critsect locked, but this is clearer and safer in case the calling code changes. Co-authored-by: Adam Johnson <[email protected]>
H-uru · Sep 19, 2023 · f931654 · f931654
1 parent bd6b2b2
commit f931654
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
@@ -1327,6 +1327,7 @@ static CliAuConn * GetConnIncRef (const char tag[]) {
 
 //============================================================================
 static void AbandonConn(CliAuConn* conn) {
+    hsLockGuard(s_critsect);
     conn->abandoned = true;
 
     conn->StopAutoReconnect();

diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp
@@ -275,6 +275,7 @@ static CliFileConn * GetConnIncRef (const char tag[]) {
 
 //============================================================================
 static void AbandonConn(CliFileConn* conn) {
+    hsLockGuard(s_critsect);
     conn->abandoned = true;
 
     if (conn->AutoReconnectEnabled())

diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
@@ -193,6 +193,7 @@ static CliGmConn * GetConnIncRef (const char tag[]) {
 
 //============================================================================
 static void AbandonConn(CliGmConn* conn) {
+    hsLockGuard(s_critsect);
     conn->abandoned = true;
     if (conn->cancelId) {
         AsyncSocketConnectCancel(conn->cancelId);

diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
@@ -220,6 +220,7 @@ static CliGkConn * GetConnIncRef (const char tag[]) {
 
 //============================================================================
 static void AbandonConn(CliGkConn* conn) {
+    hsLockGuard(s_critsect);
     conn->abandoned = true;
 
     conn->StopAutoReconnect();