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

Protocols: Ignore garbage data at the end of PluginMessage packets.

Browse Source 
Fixes #1692.
This commit is contained in:
Mattes D
2015-01-03 22:23:49 +01:00
parent 35a3a1b9f4
commit 06c2669cf6
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Protocol/Protocol18x.cpp
View File

@@ -2331,6 +2331,16 @@ void cProtocol180::HandlePacketPluginMessage(cByteBuffer & a_ByteBuffer)
if (Channel.substr(0, 3) == "MC|")
{
HandleVanillaPluginMessage(a_ByteBuffer, Channel);
// Skip any unread data (vanilla sometimes sends garbage at the end of a packet; #1692):
if (a_ByteBuffer.GetReadableSpace() > 1)
{
LOGD("Protocol 1.8: Skipping garbage data at the end of a vanilla PluginMessage packet, %u bytes",
a_ByteBuffer.GetReadableSpace() - 1
);
a_ByteBuffer.SkipRead(a_ByteBuffer.GetReadableSpace() - 1);
}
return;
}