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

Fixed a few out-of-bounds reads

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1465 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-05-09 19:06:16 +00:00
parent 7dc9b2ce8d
commit 7e02ec87b9
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/Blocks/BlockDirt.h
View File

@ -34,11 +34,14 @@ public:
} }
// Grass becomes dirt if there is something on top of it: // Grass becomes dirt if there is something on top of it:
BLOCKTYPE Above = a_World->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ); if (a_BlockY < cChunkDef::Height - 1)
if (!g_BlockTransparent[Above] && !g_BlockOneHitDig[Above])
{ {
a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_DIRT, 0); BLOCKTYPE Above = a_World->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ);
return; if (!g_BlockTransparent[Above] && !g_BlockOneHitDig[Above])
{
a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_DIRT, 0);
return;
}
} }
// Grass spreads to adjacent blocks: // Grass spreads to adjacent blocks:
@ -51,6 +54,11 @@ public:
BLOCKTYPE DestBlock; BLOCKTYPE DestBlock;
NIBBLETYPE DestMeta; NIBBLETYPE DestMeta;
if ((a_BlockY + OfsY < 0) || (a_BlockY + OfsY >= cChunkDef::Height - 1))
{
// Y Coord out of range
continue;
}
bool IsValid = a_World->GetBlockTypeMeta(a_BlockX + OfsX, a_BlockY + OfsY, a_BlockZ + OfsZ, DestBlock, DestMeta); bool IsValid = a_World->GetBlockTypeMeta(a_BlockX + OfsX, a_BlockY + OfsY, a_BlockZ + OfsZ, DestBlock, DestMeta);
if (!IsValid || (DestBlock != E_BLOCK_DIRT)) if (!IsValid || (DestBlock != E_BLOCK_DIRT))
{ {

9
source/LightingThread.cpp
View File

@ -407,9 +407,12 @@ void cLightingThread::PrepareSkyLight(void)
} }
// Add Current as a seed: // Add Current as a seed:
int CurrentIdx = idx + Current * BlocksPerYLayer; if (Current < cChunkDef::Height)
m_IsSeed1[CurrentIdx] = true; {
m_SeedIdx1[m_NumSeeds++] = CurrentIdx; int CurrentIdx = idx + Current * BlocksPerYLayer;
m_IsSeed1[CurrentIdx] = true;
m_SeedIdx1[m_NumSeeds++] = CurrentIdx;
}
// Add seed from Current up to the highest neighbor: // Add seed from Current up to the highest neighbor:
for (int y = Current + 1, Index = idx + y * BlocksPerYLayer; y < MaxNeighbor; y++, Index += BlocksPerYLayer) for (int y = Current + 1, Index = idx + y * BlocksPerYLayer; y < MaxNeighbor; y++, Index += BlocksPerYLayer)