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): reject truncated resist logs

Browse source
This commit is contained in:
Kelsi 2026-03-14 15:06:29 -07:00
parent 5c8a2afa35
commit f07b730473
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/game/game_handler.cpp
View file

@ -7146,19 +7146,18 @@ void GameHandler::handlePacket(network::Packet& packet) {
? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet); ? packet.readUInt64() : UpdateObjectParser::readPackedGuid(packet);
if (rl_rem() < 4) { packet.setReadPos(packet.getSize()); break; } if (rl_rem() < 4) { packet.setReadPos(packet.getSize()); break; }
uint32_t spellId = packet.readUInt32(); uint32_t spellId = packet.readUInt32();
int32_t resistedAmount = 0;
// Resist payload includes: // Resist payload includes:
// float resistFactor + uint32 targetResistance + uint32 resistedValue. // float resistFactor + uint32 targetResistance + uint32 resistedValue.
// Some servers may truncate optional tail fields, so parse defensively. // Require the full payload so truncated packets cannot synthesize
if (rl_rem() >= 12) { // zero-value resist events.
/*float resistFactor =*/ packet.readFloat(); if (rl_rem() < 12) { packet.setReadPos(packet.getSize()); break; }
/*uint32_t targetRes =*/ packet.readUInt32(); /*float resistFactor =*/ packet.readFloat();
resistedAmount = static_cast<int32_t>(packet.readUInt32()); /*uint32_t targetRes =*/ packet.readUInt32();
} int32_t resistedAmount = static_cast<int32_t>(packet.readUInt32());
// Show RESIST when the player is involved on either side. // Show RESIST when the player is involved on either side.
if (victimGuid == playerGuid) { if (resistedAmount > 0 && victimGuid == playerGuid) {
addCombatText(CombatTextEntry::RESIST, resistedAmount, spellId, false, 0, attackerGuid, victimGuid); addCombatText(CombatTextEntry::RESIST, resistedAmount, spellId, false, 0, attackerGuid, victimGuid);
} else if (attackerGuid == playerGuid) { } else if (resistedAmount > 0 && attackerGuid == playerGuid) {
addCombatText(CombatTextEntry::RESIST, resistedAmount, spellId, true, 0, attackerGuid, victimGuid); addCombatText(CombatTextEntry::RESIST, resistedAmount, spellId, true, 0, attackerGuid, victimGuid);
} }
packet.setReadPos(packet.getSize()); packet.setReadPos(packet.getSize());