Acquire connectionLock in CMClient::Disconnected to handle concurrent…

… Disconnected race
SteamRE · Dec 29, 2017 · e681328 · e681328
1 parent 2c02f01
commit e681328
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/SteamKit2/SteamKit2/Steam/CMClient.cs b/SteamKit2/SteamKit2/Steam/CMClient.cs
@@ -402,15 +402,19 @@ void Disconnected( object sender, DisconnectedEventArgs e )
             SessionID = null;
             SteamID = null;
 
+            lock ( connectionLock )
+            {
+                if ( connection == null ) return;
 
-            connection.NetMsgReceived -= NetMsgReceived;
-            connection.Connected -= Connected;
-            connection.Disconnected -= Disconnected;
-            connection = null;
+                connection.NetMsgReceived -= NetMsgReceived;
+                connection.Connected -= Connected;
+                connection.Disconnected -= Disconnected;
+                connection = null;
 
-            heartBeatFunc.Stop();
+                heartBeatFunc.Stop();
 
-            OnClientDisconnected( userInitiated: e.UserInitiated || ExpectDisconnection );
+                OnClientDisconnected( userInitiated: e.UserInitiated || ExpectDisconnection );
+            }
         }
 
         internal static IPacketMsg GetPacketMsg( byte[] data )