Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/PacketIO: Added missing packet array size checks

Browse Source
This commit is contained in:
Shauren
2019-07-28 00:07:19 +02:00
parent 168fd20709
commit f2ef5f878d
7 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Guilds/Guild.cpp
View File

@@ -1418,7 +1418,7 @@ void Guild::SendGuildRankInfo(WorldSession* session) const
TC_LOG_DEBUG("guild", "SMSG_GUILD_RANK [%s]", session->GetPlayerInfo().c_str());
}
void Guild::HandleSetAchievementTracking(WorldSession* session, std::set<uint32> const& achievementIds)
void Guild::HandleSetAchievementTracking(WorldSession* session, uint32 const* achievementIdsBegin, uint32 const* achievementIdsEnd)
{
Player* player = session->GetPlayer();
@@ -1426,10 +1426,14 @@ void Guild::HandleSetAchievementTracking(WorldSession* session, std::set<uint32>
{
std::set<uint32> criteriaIds;
for (uint32 achievementId : achievementIds)
for (uint32 const* achievementIdItr = achievementIdsBegin; achievementIdItr != achievementIdsEnd; ++achievementIdItr)
{
uint32 achievementId = *achievementIdItr;
if (AchievementEntry const* achievement = sAchievementStore.LookupEntry(achievementId))
{
if (!(achievement->Flags & ACHIEVEMENT_FLAG_GUILD) || m_achievementMgr.HasAchieved(achievementId))
continue;
if (CriteriaTree const* tree = sCriteriaMgr->GetCriteriaTree(achievement->CriteriaTree))
{
CriteriaMgr::WalkCriteriaTree(tree, [&criteriaIds](CriteriaTree const* node)
@@ -1441,7 +1445,7 @@ void Guild::HandleSetAchievementTracking(WorldSession* session, std::set<uint32>
}
}
member->SetTrackedCriteriaIds(criteriaIds);
member->SetTrackedCriteriaIds(std::move(criteriaIds));
m_achievementMgr.SendAllTrackedCriterias(player, member->GetTrackedCriteriaIds());
}
}

6
src/server/game/Guilds/Guild.h
View File

@@ -368,8 +368,8 @@ class TC_GAME_API Guild
uint32 GetTotalReputation() const { return m_totalReputation; }
uint32 GetWeekReputation() const { return m_weekReputation; }
std::set<uint32> GetTrackedCriteriaIds() const { return m_trackedCriteriaIds; }
void SetTrackedCriteriaIds(std::set<uint32> criteriaIds) { m_trackedCriteriaIds.swap(criteriaIds); }
std::set<uint32> const& GetTrackedCriteriaIds() const { return m_trackedCriteriaIds; }
void SetTrackedCriteriaIds(std::set<uint32> criteriaIds) { m_trackedCriteriaIds = std::move(criteriaIds); }
bool IsTrackingCriteriaId(uint32 criteriaId) const { return m_trackedCriteriaIds.find(criteriaId) != m_trackedCriteriaIds.end(); }
bool IsOnline() const { return (m_flags & GUILDMEMBER_STATUS_ONLINE); }
@@ -755,7 +755,7 @@ class TC_GAME_API Guild
// Handle client commands
void HandleRoster(WorldSession* session);
void SendQueryResponse(WorldSession* session, ObjectGuid const& playerGuid);
void HandleSetAchievementTracking(WorldSession* session, std::set<uint32> const& achievementIds);
void HandleSetAchievementTracking(WorldSession* session, uint32 const* achievementIdsBegin, uint32 const* achievementIdsEnd);
void HandleGetAchievementMembers(WorldSession* session, uint32 achievementId) const;
void HandleSetMOTD(WorldSession* session, std::string const& motd);
void HandleSetInfo(WorldSession* session, std::string const& info);

3
src/server/game/Handlers/GuildHandler.cpp
View File

@@ -436,8 +436,9 @@ void WorldSession::HandleGuildSetGuildMaster(WorldPackets::Guild::GuildSetGuildM
void WorldSession::HandleGuildSetAchievementTracking(WorldPackets::Guild::GuildSetAchievementTracking& packet)
{
if (Guild* guild = GetPlayer()->GetGuild())
guild->HandleSetAchievementTracking(this, packet.AchievementIDs);
guild->HandleSetAchievementTracking(this, packet.AchievementIDs.data(), packet.AchievementIDs.data() + packet.AchievementIDs.size());
}
void WorldSession::HandleGuildGetAchievementMembers(WorldPackets::Achievement::GuildGetAchievementMembers& getAchievementMembers)
{
if (Guild* guild = GetPlayer()->GetGuild())

3
src/server/game/Server/Packets/ClientConfigPackets.cpp
View File

@@ -59,6 +59,9 @@ void WorldPackets::ClientConfig::UserClientUpdateAccountData::Read()
DataType = _worldPacket.ReadBits(3);
uint32 compressedSize = _worldPacket.read<uint32>();
if (compressedSize > _worldPacket.size() - _worldPacket.rpos())
throw ByteBufferPositionException(_worldPacket.rpos(), _worldPacket.size(), compressedSize);
if (compressedSize)
{
CompressedData.resize(compressedSize);

11
src/server/game/Server/Packets/GuildPackets.cpp
View File

@@ -807,15 +807,10 @@ WorldPacket const* WorldPackets::Guild::PlayerSaveGuildEmblem::Write()
void WorldPackets::Guild::GuildSetAchievementTracking::Read()
{
uint32 count;
_worldPacket >> count;
AchievementIDs.resize(_worldPacket.read<uint32>());
for (uint32 i = 0; i < count; ++i)
{
uint32 value;
_worldPacket >> value;
AchievementIDs.insert(value);
}
for (uint32& achievementID : AchievementIDs)
_worldPacket >> achievementID;
}
WorldPacket const* WorldPackets::Guild::GuildNameChanged::Write()

2
src/server/game/Server/Packets/GuildPackets.h
View File

@@ -1018,7 +1018,7 @@ namespace WorldPackets
void Read() override;
std::set<uint32> AchievementIDs;
Array<uint32, 10> AchievementIDs;
};
class GuildNameChanged final : ServerPacket

2
src/server/game/Server/Packets/LootPackets.h
View File

@@ -89,7 +89,7 @@ namespace WorldPackets
void Read() override;
std::vector<LootRequest> Loot;
Array<LootRequest, 1000> Loot;
};
class LootRemoved final : public ServerPacket