Fix client debug assertion with large packets

otland · Nov 9, 2013 · c4a27b4 · c4a27b4
1 parent 522edda
commit c4a27b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/networkmessage.h b/src/networkmessage.h
@@ -36,6 +36,7 @@ class NetworkMessage
 		enum { crypto_length = 4 };
 		enum { xtea_multiple = 8 };
 		enum { max_body_length = NETWORKMESSAGE_MAXSIZE - header_length - crypto_length - xtea_multiple };
+		enum { max_protocol_body_length = max_body_length - 10 };
 
 		// constructor/destructor
 		NetworkMessage() {

diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -56,13 +56,12 @@ void Protocol::onRecvMessage(NetworkMessage& msg)
 
 OutputMessage_ptr Protocol::getOutputBuffer(int32_t size)
 {
-	if (m_outputBuffer && NetworkMessage::max_body_length >= m_outputBuffer->getMessageLength() + size) {
+	if (m_outputBuffer && NetworkMessage::max_protocol_body_length >= m_outputBuffer->getMessageLength() + size) {
 		return m_outputBuffer;
 	} else if (m_connection) {
 		m_outputBuffer = OutputMessagePool::getInstance()->getOutputMessage(this);
 		return m_outputBuffer;
 	}
-
 	return OutputMessage_ptr();
 }