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

Merge pull request #1141 from Howaner/GlobalFixes

Browse Source 
Fix server-crash with non-existing items.
This commit is contained in:
Mattes D 2014-07-01 21:41:12 +02:00
commit 621400c9c6
2 changed files with 2 additions and 2 deletions
Show Stats 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) || ((unsigned long)a_ItemType >= ARRAYCOUNT(m_ItemHandler)))
{
// Either nothing (-1), or bad value, both cases should return the air handler
if (a_ItemType < -1)

2
src/UI/Window.cpp
View File

@ -170,7 +170,7 @@ void cWindow::Clicked(
const cItem & a_ClickedItem
)
{
cPluginManager * PlgMgr = cRoot::Get()->GetPluginManager();
cPluginManager * PlgMgr = cRoot::Get()->GetPluginManager();
if (a_WindowID != m_WindowID)
{
LOGWARNING("%s: Wrong window ID (exp %d, got %d) received from \"%s\"; ignoring click.", __FUNCTION__, m_WindowID, a_WindowID, a_Player.GetName().c_str());