DEV9: Fix race-condition while handling closed connection

PCSX2 · Dec 5, 2024 · f91f39a · f91f39a
1 parent f317ba3
commit f91f39a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pcsx2/DEV9/ThreadSafeMap.h b/pcsx2/DEV9/ThreadSafeMap.h
@@ -37,10 +37,10 @@ class ThreadSafeMap
 		map[key] = value;
 	}
 
-	void Remove(Key key)
+	bool Remove(Key key)
 	{
 		std::unique_lock modifyLock(accessMutex);
-		map.erase(key);
+		return map.erase(key) == 1;
 	}
 
 	void Clear()

diff --git a/pcsx2/DEV9/sockets.cpp b/pcsx2/DEV9/sockets.cpp
@@ -527,7 +527,8 @@ int SocketAdapter::SendFromConnection(ConnectionKey Key, IP_Packet* ipPkt)
 void SocketAdapter::HandleConnectionClosed(BaseSession* sender)
 {
 	const ConnectionKey key = sender->key;
-	connections.Remove(key);
+	if (!connections.Remove(key))
+		return;
 
 	// Defer deleting the connection untill we have left the calling session's callstack
 	if (std::this_thread::get_id() == sendThreadId)
@@ -558,7 +559,8 @@ void SocketAdapter::HandleConnectionClosed(BaseSession* sender)
 void SocketAdapter::HandleFixedPortClosed(BaseSession* sender)
 {
 	const ConnectionKey key = sender->key;
-	connections.Remove(key);
+	if (!connections.Remove(key))
+		return;
 	fixedUDPPorts.Remove(key.ps2Port);
 
 	// Defer deleting the connection untill we have left the calling session's callstack