1.8 Protocol: Fixed a possible race condition.

Fixes #1759.
cuberite · Feb 24, 2015 · c286b186c4905b0a36a6bae7bc2af6d672cd82e2 · c286b18
1 parent b474b9f
commit c286b186c4905b0a36a6bae7bc2af6d672cd82e2
Unified Split

Showing with 9 additions and 5 deletions.

+9 −5 src/Protocol/Protocol18x.cpp
diff --git a/src/Protocol/Protocol18x.cpp b/src/Protocol/Protocol18x.cpp
@@ -874,11 +874,15 @@ void cProtocol180::SendPlayerListUpdatePing(const cPlayer & a_Player)
 {
 	ASSERT(m_State == 3);  // In game mode?

-	cPacketizer Pkt(*this, 0x38);  // Playerlist Item packet
-	Pkt.WriteVarInt(2);
-	Pkt.WriteVarInt(1);
-	Pkt.WriteUUID(a_Player.GetUUID());
-	Pkt.WriteVarInt((UInt32)a_Player.GetClientHandle()->GetPing());
+	auto ClientHandle = a_Player.GetClientHandlePtr();
+	if (ClientHandle != nullptr)
+	{
+		cPacketizer Pkt(*this, 0x38);  // Playerlist Item packet
+		Pkt.WriteVarInt(2);
+		Pkt.WriteVarInt(1);
+		Pkt.WriteUUID(a_Player.GetUUID());
+		Pkt.WriteVarInt(static_cast<UInt32>(ClientHandle->GetPing()));
+	}
 }