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

Fixed stupid buffer overflow in array setblocks

Browse Source
This commit is contained in:
Tycho
2014-05-10 17:46:49 +01:00
parent ba25f6b524
commit 0adb5c94b8
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChunkBuffer.cpp
View File

@@ -35,7 +35,7 @@ void cChunkBuffer::CopyBlocks (BLOCKTYPE * a_dest, size_t a_Idx, size_t length
memcpy(
&a_dest[i * segment_length],
&m_Sections[i]->m_BlockTypes,
sizeof(BLOCKTYPE) * length
sizeof(BLOCKTYPE) * tocopy
);
}
else
@@ -43,7 +43,7 @@ void cChunkBuffer::CopyBlocks (BLOCKTYPE * a_dest, size_t a_Idx, size_t length
memset(
&a_dest[i * segment_length],
0,
sizeof(BLOCKTYPE) * length
sizeof(BLOCKTYPE) * tocopy
);
}
}
@@ -141,7 +141,7 @@ void cChunkBuffer::SetBlocks(const BLOCKTYPE * a_src)
{
for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
{
const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16;
if (m_Sections[i])
{
memcpy(&m_Sections[i]->m_BlockTypes, &a_src[i * segment_length], sizeof(BLOCKTYPE) * segment_length);