From 64f6ddf1e2171dd7713f454c792916257e770f98 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 1 Jul 2014 14:47:49 +0200
Subject: Fix server-crash with non-existing items.

---
 src/Items/ItemHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Items/ItemHandler.cpp')

diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index a2fd4e3f8..0f56b2b90 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) || (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)
-- 
cgit v1.2.3