flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Potential crash fixes

Browse Source 
* Potentially addresses my comment in #1969
* Probably fixes #2145
This commit is contained in:
Tiger Wang 2015-05-28 13:03:28 +01:00
parent 1487f57905
commit 20b7152572
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ClientHandle.cpp
View File

@ -1902,7 +1902,7 @@ void cClientHandle::Tick(float a_Dt)
if (m_TicksSinceLastPacket > 600) // 30 seconds time-out if (m_TicksSinceLastPacket > 600) // 30 seconds time-out
{ {
SendDisconnect("Nooooo!! You timed out! D: Come back!"); SendDisconnect("Nooooo!! You timed out! D: Come back!");
Destroy(); return;
} }
if (m_Player == nullptr) if (m_Player == nullptr)
@ -2013,7 +2013,6 @@ void cClientHandle::ServerTick(float a_Dt)
if (m_TicksSinceLastPacket > 600) // 30 seconds if (m_TicksSinceLastPacket > 600) // 30 seconds
{ {
SendDisconnect("Nooooo!! You timed out! D: Come back!"); SendDisconnect("Nooooo!! You timed out! D: Come back!");
Destroy();
} }
} }
@ -2186,6 +2185,7 @@ void cClientHandle::SendDisconnect(const AString & a_Reason)
{ {
LOGD("Sending a DC: \"%s\"", StripColorCodes(a_Reason).c_str()); LOGD("Sending a DC: \"%s\"", StripColorCodes(a_Reason).c_str());
m_Protocol->SendDisconnect(a_Reason); m_Protocol->SendDisconnect(a_Reason);
Destroy();
m_HasSentDC = true; m_HasSentDC = true;
} }
} }
@ -2922,7 +2922,6 @@ void cClientHandle::PacketBufferFull(void)
// Too much data in the incoming queue, the server is probably too busy, kick the client: // Too much data in the incoming queue, the server is probably too busy, kick the client:
LOGERROR("Too much data in queue for client \"%s\" @ %s, kicking them.", m_Username.c_str(), m_IPString.c_str()); LOGERROR("Too much data in queue for client \"%s\" @ %s, kicking them.", m_Username.c_str(), m_IPString.c_str());
SendDisconnect("Server busy"); SendDisconnect("Server busy");
Destroy();
} }
@ -2936,7 +2935,6 @@ void cClientHandle::PacketUnknown(UInt32 a_PacketType)
AString Reason; AString Reason;
Printf(Reason, "Unknown [C->S] PacketType: 0x%x", a_PacketType); Printf(Reason, "Unknown [C->S] PacketType: 0x%x", a_PacketType);
SendDisconnect(Reason); SendDisconnect(Reason);
Destroy();
} }
@ -2947,7 +2945,6 @@ void cClientHandle::PacketError(UInt32 a_PacketType)
{ {
LOGERROR("Protocol error while parsing packet type 0x%02x; disconnecting client \"%s\"", a_PacketType, m_Username.c_str()); LOGERROR("Protocol error while parsing packet type 0x%02x; disconnecting client \"%s\"", a_PacketType, m_Username.c_str());
SendDisconnect("Protocol error"); SendDisconnect("Protocol error");
Destroy();
} }
@ -2963,7 +2960,7 @@ void cClientHandle::SocketClosed(void)
LOGD("Client %s @ %s disconnected", m_Username.c_str(), m_IPString.c_str()); LOGD("Client %s @ %s disconnected", m_Username.c_str(), m_IPString.c_str());
cRoot::Get()->GetPluginManager()->CallHookDisconnect(*this, "Player disconnected"); cRoot::Get()->GetPluginManager()->CallHookDisconnect(*this, "Player disconnected");
} }
if (m_State < csDestroying) if ((m_State < csDestroying) && (m_Player != nullptr))
{ {
cWorld * World = m_Player->GetWorld(); cWorld * World = m_Player->GetWorld();
if (World != nullptr) if (World != nullptr)