From 0fc887a3d249b98c1a6cc37c91e6b95ce29b04be Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Sat, 14 Mar 2026 01:18:28 -0700
Subject: [PATCH] fix(combatlog): validate packed proc log GUIDs

---
 src/game/game_handler.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/game/game_handler.cpp b/src/game/game_handler.cpp
index a3275997..b8db9c3a 100644
--- a/src/game/game_handler.cpp
+++ b/src/game/game_handler.cpp
@@ -2110,9 +2110,15 @@ void GameHandler::handlePacket(network::Packet& packet) {
                     return (packet.getSize() - packet.getReadPos() >= 8) ? packet.readUInt64() : 0;
                 return UpdateObjectParser::readPackedGuid(packet);
             };
-            if (packet.getSize() - packet.getReadPos() < (prUsesFullGuid ? 8u : 1u)) break;
+            if (packet.getSize() - packet.getReadPos() < (prUsesFullGuid ? 8u : 1u)
+                || (!prUsesFullGuid && !hasFullPackedGuid(packet))) {
+                packet.setReadPos(packet.getSize()); break;
+            }
             uint64_t caster = readPrGuid();
-            if (packet.getSize() - packet.getReadPos() < (prUsesFullGuid ? 8u : 1u)) break;
+            if (packet.getSize() - packet.getReadPos() < (prUsesFullGuid ? 8u : 1u)
+                || (!prUsesFullGuid && !hasFullPackedGuid(packet))) {
+                packet.setReadPos(packet.getSize()); break;
+            }
             uint64_t victim = readPrGuid();
             if (packet.getSize() - packet.getReadPos() < 4) break;
             uint32_t spellId = packet.readUInt32();
@@ -6391,11 +6397,13 @@ void GameHandler::handlePacket(network::Packet& packet) {
                     return (packet.getSize() - packet.getReadPos() >= 8) ? packet.readUInt64() : 0;
                 return UpdateObjectParser::readPackedGuid(packet);
             };
-            if (packet.getSize() - packet.getReadPos() < (procChanceUsesFullGuid ? 8u : 1u)) {
+            if (packet.getSize() - packet.getReadPos() < (procChanceUsesFullGuid ? 8u : 1u)
+                || (!procChanceUsesFullGuid && !hasFullPackedGuid(packet))) {
                 packet.setReadPos(packet.getSize()); break;
             }
             uint64_t procTargetGuid = readProcChanceGuid();
-            if (packet.getSize() - packet.getReadPos() < (procChanceUsesFullGuid ? 8u : 1u)) {
+            if (packet.getSize() - packet.getReadPos() < (procChanceUsesFullGuid ? 8u : 1u)
+                || (!procChanceUsesFullGuid && !hasFullPackedGuid(packet))) {
                 packet.setReadPos(packet.getSize()); break;
             }
             uint64_t procCasterGuid = readProcChanceGuid();