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

Fixed a few possible crashes with out-of-bounds Y coords

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1413 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-04-27 13:23:20 +00:00
parent c40eb92de3
commit 1b7ea2ef82
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/Blocks/BlockHandler.cpp
View File

@ -287,9 +287,12 @@ void cBlockHandler::OnDestroyed(cWorld *a_World, int a_BlockX, int a_BlockY, int
void cBlockHandler::NeighborChanged(cWorld *a_World, int a_BlockX, int a_BlockY, int a_BlockZ) void cBlockHandler::NeighborChanged(cWorld *a_World, int a_BlockX, int a_BlockY, int a_BlockZ)
{
if ((a_BlockY >= 0) && (a_BlockY < cChunkDef::Height))
{ {
GetBlockHandler(a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ))->OnNeighborChanged(a_World, a_BlockX, a_BlockY, a_BlockZ); GetBlockHandler(a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ))->OnNeighborChanged(a_World, a_BlockX, a_BlockY, a_BlockZ);
} }
}

12
source/Chunk.cpp
View File

@ -1043,6 +1043,12 @@ bool cChunk::UnboundedRelFastSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKT
void cChunk::UnboundedQueueTickBlock(int a_RelX, int a_RelY, int a_RelZ) void cChunk::UnboundedQueueTickBlock(int a_RelX, int a_RelY, int a_RelZ)
{ {
if ((a_RelY < 0) || (a_RelY >= cChunkDef::Height))
{
// Outside of chunkmap
return;
}
// Is it in this chunk? // Is it in this chunk?
if ((a_RelX >= 0) && (a_RelX < cChunkDef::Width) && (a_RelZ >= 0) && (a_RelZ < cChunkDef::Width)) if ((a_RelX >= 0) && (a_RelX < cChunkDef::Width) && (a_RelZ >= 0) && (a_RelZ < cChunkDef::Width))
{ {
@ -1350,6 +1356,12 @@ void cChunk::SetBlock( int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType
void cChunk::QueueTickBlock(int a_RelX, int a_RelY, int a_RelZ) void cChunk::QueueTickBlock(int a_RelX, int a_RelY, int a_RelZ)
{ {
ASSERT (
(a_RelX >= 0) && (a_RelX < Width) &&
(a_RelY >= 0) && (a_RelY < Height) &&
(a_RelZ >= 0) && (a_RelZ < Width)
); // Coords need to be valid
if (!IsValid()) if (!IsValid())
{ {
return; return;