diff options
| author | Mattes D <github@xoft.cz> | 2014-12-21 22:51:17 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-12-21 22:51:17 +0100 |
| commit | 557dc5a93f04798474e7ca114a47f7c379547f94 (patch) | |
| tree | 25f7132b39f6f0f063364da9c392985020a4f749 | |
| parent | MCADefrag: Added a sanity check for chunk size. (diff) | |
| download | cuberite-557dc5a93f04798474e7ca114a47f7c379547f94.tar cuberite-557dc5a93f04798474e7ca114a47f7c379547f94.tar.gz cuberite-557dc5a93f04798474e7ca114a47f7c379547f94.tar.bz2 cuberite-557dc5a93f04798474e7ca114a47f7c379547f94.tar.lz cuberite-557dc5a93f04798474e7ca114a47f7c379547f94.tar.xz cuberite-557dc5a93f04798474e7ca114a47f7c379547f94.tar.zst cuberite-557dc5a93f04798474e7ca114a47f7c379547f94.zip | |
| -rw-r--r-- | Tools/ProtoProxy/Connection.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp index fb2d40e5b..468529124 100644 --- a/Tools/ProtoProxy/Connection.cpp +++ b/Tools/ProtoProxy/Connection.cpp @@ -2687,7 +2687,7 @@ bool cConnection::ParseSlot(cByteBuffer & a_Buffer, AString & a_ItemDesc) char ItemCount; short ItemDamage; short MetadataLength; - a_Buffer.ReadChar(ItemCount); + a_Buffer.ReadChar(ItemCount); // We already know we can read these bytes - we checked before. a_Buffer.ReadBEShort(ItemDamage); a_Buffer.ReadBEShort(MetadataLength); Printf(a_ItemDesc, "%d:%d * %d", ItemType, ItemDamage, ItemCount); @@ -2846,7 +2846,11 @@ void cConnection::LogMetadata(const AString & a_Metadata, size_t a_IndentCount) bb.Write(a_Metadata.data() + pos + 1, RestLen); UInt32 Length; int rs = bb.GetReadableSpace(); - bb.ReadVarInt(Length); + if (!bb.ReadVarInt(Length)) + { + Log("Invalid metadata value, was supposed to be a varint-prefixed string, but cannot read the varint"); + break; + } rs = rs - bb.GetReadableSpace(); Log("%sstring[%d] = \"%*s\"", Indent.c_str(), Index, Length, a_Metadata.c_str() + pos + rs + 1); pos += Length + rs + 2; |