summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-07-01 21:41:12 +0200
committerMattes D <github@xoft.cz>2014-07-01 21:41:12 +0200
commit621400c9c6a054325e1c7c5d5ecb5dd542127cc1 (patch)
treebeddb9e6293e4bb3a7aba04d1d7901f1e0af27e0
parentMerge pull request #1140 from mc-server/FixMingw (diff)
parentOnly fixes the server crash. (diff)
downloadcuberite-621400c9c6a054325e1c7c5d5ecb5dd542127cc1.tar
cuberite-621400c9c6a054325e1c7c5d5ecb5dd542127cc1.tar.gz
cuberite-621400c9c6a054325e1c7c5d5ecb5dd542127cc1.tar.bz2
cuberite-621400c9c6a054325e1c7c5d5ecb5dd542127cc1.tar.lz
cuberite-621400c9c6a054325e1c7c5d5ecb5dd542127cc1.tar.xz
cuberite-621400c9c6a054325e1c7c5d5ecb5dd542127cc1.tar.zst
cuberite-621400c9c6a054325e1c7c5d5ecb5dd542127cc1.zip
Diffstat (limited to '')
-rw-r--r--src/Items/ItemHandler.cpp2
-rw-r--r--src/UI/Window.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index a2fd4e3f8..423039cf4 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -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)
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index 98a9a0cec..e465b701a 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -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());