From 99a6252d6a0d7cd146d5c70d30b67cdb9a277ad5 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Wed, 7 Nov 2012 10:42:21 +0000 Subject: [PATCH] Hotfix for ThuGie's crash, with a sanity check in debug mode. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1023 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/ByteBuffer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/ByteBuffer.cpp b/source/ByteBuffer.cpp index 912f562f..c1ff4c6f 100644 --- a/source/ByteBuffer.cpp +++ b/source/ByteBuffer.cpp @@ -354,7 +354,8 @@ bool cByteBuffer::ReadBuf(void * a_Buffer, int a_Count) NEEDBYTES(a_Count); char * Dst = (char *)a_Buffer; // So that we can do byte math int BytesToEndOfBuffer = m_BufferSize - m_ReadPos; - if (BytesToEndOfBuffer < a_Count) + ASSERT(BytesToEndOfBuffer >= 0); // Sanity check + if ((BytesToEndOfBuffer > 0) && (BytesToEndOfBuffer < a_Count)) { // Reading across the ringbuffer end, read the first part and adjust parameters: memcpy(Dst, m_Buffer + m_ReadPos, BytesToEndOfBuffer);