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

Fix server-crash with non-existing items.

Browse Source
This commit is contained in:
Howaner
2014-07-01 14:47:49 +02:00
parent 24c86df12e
commit 64f6ddf1e2
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Items/ItemHandler.cpp
View File

@@ -63,7 +63,7 @@ cItemHandler * cItemHandler::m_ItemHandler[2268];
cItemHandler * cItemHandler::GetItemHandler(int a_ItemType)
{
if (a_ItemType < 0)
if ((a_ItemType < 0) || (a_ItemType >= ARRAYCOUNT(m_ItemHandler)) || (!IsValidBlock(a_ItemType) && !IsValidItem(a_ItemType)))
{
// Either nothing (-1), or bad value, both cases should return the air handler
if (a_ItemType < -1)