phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-17 17:43:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(combatlog): validate tbc spelllogexecute effect GUIDs

Browse source
This commit is contained in:
Kelsi 2026-03-13 23:40:39 -07:00
parent 57265bfa4f
commit 842771cb10
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/game/game_handler.cpp
View file

@ -6432,9 +6432,12 @@ void GameHandler::handlePacket(network::Packet& packet) {
if (effectType == 10) { if (effectType == 10) {
// SPELL_EFFECT_POWER_DRAIN: packed_guid target + uint32 amount + uint32 powerType + float multiplier // SPELL_EFFECT_POWER_DRAIN: packed_guid target + uint32 amount + uint32 powerType + float multiplier
for (uint32_t li = 0; li < effectLogCount; ++li) { for (uint32_t li = 0; li < effectLogCount; ++li) {
if (packet.getSize() - packet.getReadPos() < 1) break; const size_t guidBytes = exeTbcLike ? 8u : 1u;
if (packet.getSize() - packet.getReadPos() < guidBytes) {
packet.setReadPos(packet.getSize()); break;
}
uint64_t drainTarget = exeTbcLike uint64_t drainTarget = exeTbcLike
? (packet.getSize() - packet.getReadPos() >= 8 ? packet.readUInt64() : 0) ? packet.readUInt64()
: UpdateObjectParser::readPackedGuid(packet); : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 12) { packet.setReadPos(packet.getSize()); break; } if (packet.getSize() - packet.getReadPos() < 12) { packet.setReadPos(packet.getSize()); break; }
uint32_t drainAmount = packet.readUInt32(); uint32_t drainAmount = packet.readUInt32();
@ -6454,9 +6457,12 @@ void GameHandler::handlePacket(network::Packet& packet) {
} else if (effectType == 11) { } else if (effectType == 11) {
// SPELL_EFFECT_HEALTH_LEECH: packed_guid target + uint32 amount + float multiplier // SPELL_EFFECT_HEALTH_LEECH: packed_guid target + uint32 amount + float multiplier
for (uint32_t li = 0; li < effectLogCount; ++li) { for (uint32_t li = 0; li < effectLogCount; ++li) {
if (packet.getSize() - packet.getReadPos() < 1) break; const size_t guidBytes = exeTbcLike ? 8u : 1u;
if (packet.getSize() - packet.getReadPos() < guidBytes) {
packet.setReadPos(packet.getSize()); break;
}
uint64_t leechTarget = exeTbcLike uint64_t leechTarget = exeTbcLike
? (packet.getSize() - packet.getReadPos() >= 8 ? packet.readUInt64() : 0) ? packet.readUInt64()
: UpdateObjectParser::readPackedGuid(packet); : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 8) { packet.setReadPos(packet.getSize()); break; } if (packet.getSize() - packet.getReadPos() < 8) { packet.setReadPos(packet.getSize()); break; }
uint32_t leechAmount = packet.readUInt32(); uint32_t leechAmount = packet.readUInt32();
@ -6496,9 +6502,12 @@ void GameHandler::handlePacket(network::Packet& packet) {
} else if (effectType == 26) { } else if (effectType == 26) {
// SPELL_EFFECT_INTERRUPT_CAST: packed_guid target + uint32 interrupted_spell_id // SPELL_EFFECT_INTERRUPT_CAST: packed_guid target + uint32 interrupted_spell_id
for (uint32_t li = 0; li < effectLogCount; ++li) { for (uint32_t li = 0; li < effectLogCount; ++li) {
if (packet.getSize() - packet.getReadPos() < 1) break; const size_t guidBytes = exeTbcLike ? 8u : 1u;
if (packet.getSize() - packet.getReadPos() < guidBytes) {
packet.setReadPos(packet.getSize()); break;
}
uint64_t icTarget = exeTbcLike uint64_t icTarget = exeTbcLike
? (packet.getSize() - packet.getReadPos() >= 8 ? packet.readUInt64() : 0) ? packet.readUInt64()
: UpdateObjectParser::readPackedGuid(packet); : UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 4) { packet.setReadPos(packet.getSize()); break; } if (packet.getSize() - packet.getReadPos() < 4) { packet.setReadPos(packet.getSize()); break; }
uint32_t icSpellId = packet.readUInt32(); uint32_t icSpellId = packet.readUInt32();