diff options
| author | Masy98 <masy@antheruscraft.de> | 2014-09-01 21:30:45 +0200 |
|---|---|---|
| committer | Masy98 <masy@antheruscraft.de> | 2014-09-01 21:30:45 +0200 |
| commit | cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7 (patch) | |
| tree | de161c8abb3a9fb961b794e4d4cf255102b83715 /src/Protocol/ProtocolRecognizer.cpp | |
| parent | Fixed spacing and light gray wool name! (diff) | |
| parent | Merge pull request #1368 from mc-server/coverityFixes (diff) | |
| download | cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar.gz cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar.bz2 cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar.lz cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar.xz cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.tar.zst cuberite-cc9acd13b90c2dff21b6a7b7d4db57780aba0fc7.zip | |
Diffstat (limited to 'src/Protocol/ProtocolRecognizer.cpp')
| -rw-r--r-- | src/Protocol/ProtocolRecognizer.cpp | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp index c831da251..8b395230a 100644 --- a/src/Protocol/ProtocolRecognizer.cpp +++ b/src/Protocol/ProtocolRecognizer.cpp @@ -979,9 +979,18 @@ bool cProtocolRecognizer::TryRecognizeLengthedProtocol(UInt32 a_PacketLengthRema AString ServerAddress; short ServerPort; UInt32 NextState; - m_Buffer.ReadVarUTF8String(ServerAddress); - m_Buffer.ReadBEShort(ServerPort); - m_Buffer.ReadVarInt(NextState); + if (!m_Buffer.ReadVarUTF8String(ServerAddress)) + { + break; + } + if (!m_Buffer.ReadBEShort(ServerPort)) + { + break; + } + if (!m_Buffer.ReadVarInt(NextState)) + { + break; + } m_Buffer.CommitRead(); m_Protocol = new cProtocol172(m_Client, ServerAddress, (UInt16)ServerPort, NextState); return true; @@ -991,9 +1000,18 @@ bool cProtocolRecognizer::TryRecognizeLengthedProtocol(UInt32 a_PacketLengthRema AString ServerAddress; short ServerPort; UInt32 NextState; - m_Buffer.ReadVarUTF8String(ServerAddress); - m_Buffer.ReadBEShort(ServerPort); - m_Buffer.ReadVarInt(NextState); + if (!m_Buffer.ReadVarUTF8String(ServerAddress)) + { + break; + } + if (!m_Buffer.ReadBEShort(ServerPort)) + { + break; + } + if (!m_Buffer.ReadVarInt(NextState)) + { + break; + } m_Buffer.CommitRead(); m_Protocol = new cProtocol176(m_Client, ServerAddress, (UInt16)ServerPort, NextState); return true; |