mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8091] Check bag size at item protos loading and item slots at invetory loading.

Browse source 
This is single not safe places in work with bag slots in current code.
This commit is contained in:
VladimirMangos 2009-06-29 12:47:40 +04:00 • committed by tomrus88
parent fad9c4c0b3
commit 5a8640a69b
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/ObjectMgr.cpp
View file

@ -1735,6 +1735,12 @@ void ObjectMgr::LoadItemPrototypes()
const_cast<ItemPrototype*>(proto)->Stackable = 1000;
}
if(proto->ContainerSlots > MAX_BAG_SIZE)
{
sLog.outErrorDb("Item (Entry: %u) has too large value in ContainerSlots (%u), replace by hardcoded limit (%u).",i,proto->ContainerSlots,MAX_BAG_SIZE);
const_cast<ItemPrototype*>(proto)->ContainerSlots = MAX_BAG_SIZE;
}
if(proto->StatsCount > MAX_ITEM_PROTO_STATS)
{
sLog.outErrorDb("Item (Entry: %u) has too large value in statscount (%u), replace by hardcoded limit (%u).",i,proto->StatsCount,MAX_ITEM_PROTO_STATS);

2
src/game/Player.cpp
View file

@ -14756,7 +14756,7 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
item->SetSlot(NULL_SLOT);
// the item is in a bag, find the bag
std::map<uint64, Bag*>::const_iterator itr = bagMap.find(bag_guid);
if(itr != bagMap.end())
if(itr != bagMap.end() && slot < itr->second->GetBagSize())
itr->second->StoreItem(slot, item, true );
else
success = false;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "8090"
#define REVISION_NR "8091"
#endif // __REVISION_NR_H__