[7555] Check pool_id bafire access to pool data in PoolHandler::CheckPool Author: VladimirMangos

--HG--
branch : trunk

1 files changed, 2 insertions, 1 deletions

diff --git a/src/game/PoolHandler.cpp b/src/game/PoolHandler.cpp
index a2c688dac2f..1c8cd871ab6 100644
--- a/src/game/PoolHandler.cpp
+++ b/src/game/PoolHandler.cpp
@@ -699,7 +699,8 @@ uint16 PoolHandler::IsPartOfAPool(uint32 guid, uint32 type)
 // Method that check chance integrity of the creatures and gameobjects in this pool
 bool PoolHandler::CheckPool(uint16 pool_id)
 {
-    return mPoolGameobjectGroups[pool_id].CheckPool() &&
+    return pool_id <= max_pool_id &&
+        mPoolGameobjectGroups[pool_id].CheckPool() &&
         mPoolCreatureGroups[pool_id].CheckPool() &&
         mPoolPoolGroups[pool_id].CheckPool();
 }