From 2acf288071a08682459518f52e0aacdf6131c17d Mon Sep 17 00:00:00 2001
From: spp <none@none>
Date: Sun, 6 Dec 2009 17:46:44 +0100
Subject: Add some checks to prevent guild bank crashes. Closes #646

--HG--
branch : trunk
---
 src/game/Guild.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/game/Guild.cpp')

diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp
index 62b284c9807..5e1e1409039 100644
--- a/src/game/Guild.cpp
+++ b/src/game/Guild.cpp
@@ -1904,6 +1904,10 @@ uint8 Guild::CanStoreItem( uint8 tab, uint8 slot, GuildItemPosCountVec &dest, ui
     if (pItem->IsSoulBound())
         return EQUIP_ERR_CANT_DROP_SOULBOUND;
 
+    // in specific tab
+    if (tab >=  m_TabListMap.size() || tab >= GUILD_BANK_MAX_TABS)
+        return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
+
     // in specific slot
     if (slot != NULL_SLOT)
     {
@@ -1964,7 +1968,7 @@ void Guild::SetGuildBankTabText(uint8 TabId, std::string text)
 
 void Guild::SendGuildBankTabText(WorldSession *session, uint8 TabId)
 {
-    if (TabId > GUILD_BANK_MAX_TABS)
+    if (TabId >= GUILD_BANK_MAX_TABS)                   // tabs starts in 0
         return;
 
     GuildBankTab const *tab = GetBankTab(TabId);
-- 
cgit v1.2.3