phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-22 23:30:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(combatlog): validate packed damage shield GUIDs

Browse source
This commit is contained in:
Kelsi 2026-03-14 02:01:07 -07:00
parent f6d8c01779
commit 011a148105
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/game_handler.cpp
View file

@ -6181,6 +6181,7 @@ void GameHandler::handlePacket(network::Packet& packet) {
// WotLK: packed_guid victim + packed_guid caster + spellId(4) + damage(4) + absorbed(4) + schoolMask(4) // WotLK: packed_guid victim + packed_guid caster + spellId(4) + damage(4) + absorbed(4) + schoolMask(4)
const bool shieldTbc = isActiveExpansion("tbc"); const bool shieldTbc = isActiveExpansion("tbc");
const bool shieldWotlkLike = !isClassicLikeExpansion() && !shieldTbc; const bool shieldWotlkLike = !isClassicLikeExpansion() && !shieldTbc;
const auto shieldRem = [&]() { return packet.getSize() - packet.getReadPos(); };
const size_t shieldMinSz = shieldTbc ? 24u : 2u; const size_t shieldMinSz = shieldTbc ? 24u : 2u;
if (packet.getSize() - packet.getReadPos() < shieldMinSz) { if (packet.getSize() - packet.getReadPos() < shieldMinSz) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
@ -6196,12 +6197,13 @@ void GameHandler::handlePacket(network::Packet& packet) {
} }
uint64_t casterGuid = shieldTbc uint64_t casterGuid = shieldTbc
? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet); ? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 12) { const size_t shieldTailSize = shieldWotlkLike ? 16u : 12u;
if (shieldRem() < shieldTailSize) {
packet.setReadPos(packet.getSize()); break; packet.setReadPos(packet.getSize()); break;
} }
uint32_t shieldSpellId = packet.readUInt32(); uint32_t shieldSpellId = packet.readUInt32();
uint32_t damage = packet.readUInt32(); uint32_t damage = packet.readUInt32();
if (shieldWotlkLike && packet.getSize() - packet.getReadPos() >= 4) if (shieldWotlkLike)
/*uint32_t absorbed =*/ packet.readUInt32(); /*uint32_t absorbed =*/ packet.readUInt32();
/*uint32_t school =*/ packet.readUInt32(); /*uint32_t school =*/ packet.readUInt32();
// Show combat text: damage shield reflect // Show combat text: damage shield reflect