From 9b8dbf92811c1cd7084466439d9fd37405014311 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 6 Sep 2016 22:52:32 +0200
Subject: Core/PacketIO: Defined smaller limits for incoming array sizes in
 client packets (default is 1000)

---
 src/server/game/Server/Packets/AuctionHousePackets.h | 2 +-
 src/server/game/Server/Packets/CharacterPackets.cpp  | 4 +---
 src/server/game/Server/Packets/CharacterPackets.h    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/server/game/Server')

diff --git a/src/server/game/Server/Packets/AuctionHousePackets.h b/src/server/game/Server/Packets/AuctionHousePackets.h
index 8ea9615e301..31c24cdb046 100644
--- a/src/server/game/Server/Packets/AuctionHousePackets.h
+++ b/src/server/game/Server/Packets/AuctionHousePackets.h
@@ -281,7 +281,7 @@ namespace WorldPackets
             uint8 MaxLevel = 100;
             int32 Quality = 0;
             uint8 SortCount = 0;
-            Array<uint8> KnownPets;
+            Array<uint8, BATTLE_PET_SPECIES_MAX_ID / 8 + 1> KnownPets;
             int8 MaxPetLevel;
             std::string Name;
             Array<ClassFilter, 7> ClassFilters;
diff --git a/src/server/game/Server/Packets/CharacterPackets.cpp b/src/server/game/Server/Packets/CharacterPackets.cpp
index 7e44b8f9fe7..77095cc9635 100644
--- a/src/server/game/Server/Packets/CharacterPackets.cpp
+++ b/src/server/game/Server/Packets/CharacterPackets.cpp
@@ -330,10 +330,8 @@ WorldPacket const* WorldPackets::Character::GenerateRandomCharacterNameResult::W
     return &_worldPacket;
 }
 
-WorldPackets::Character::ReorderCharacters::ReorderCharacters(WorldPacket&& packet) : ClientPacket(CMSG_REORDER_CHARACTERS, std::move(packet)),
-    Entries(sWorld->getIntConfig(CONFIG_CHARACTERS_PER_REALM))
+WorldPackets::Character::ReorderCharacters::ReorderCharacters(WorldPacket&& packet) : ClientPacket(CMSG_REORDER_CHARACTERS, std::move(packet))
 {
-
 }
 
 void WorldPackets::Character::ReorderCharacters::Read()
diff --git a/src/server/game/Server/Packets/CharacterPackets.h b/src/server/game/Server/Packets/CharacterPackets.h
index 695697468f9..9f739256bca 100644
--- a/src/server/game/Server/Packets/CharacterPackets.h
+++ b/src/server/game/Server/Packets/CharacterPackets.h
@@ -371,7 +371,7 @@ namespace WorldPackets
 
             void Read() override;
 
-            Array<ReorderInfo> Entries;
+            Array<ReorderInfo, MAX_CHARACTERS_PER_REALM> Entries;
         };
 
         class UndeleteCharacter final : public ClientPacket
-- 
cgit v1.2.3