From 150c9cce5d62030c1adb4640469f6bd5831b2103 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Thu, 15 May 2025 16:38:31 +0200
Subject: Core/PacketIO: Fixed WorldPackets::SizedCString read function (it
 should not attempt to read null terminator if empty)

---
 src/server/game/Server/Packets/PacketUtilities.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Server/Packets/PacketUtilities.h b/src/server/game/Server/Packets/PacketUtilities.h
index 678d6aba977..e865ec40061 100644
--- a/src/server/game/Server/Packets/PacketUtilities.h
+++ b/src/server/game/Server/Packets/PacketUtilities.h
@@ -561,8 +561,11 @@ namespace WorldPackets
         {
             friend inline ByteBuffer& operator>>(ByteBuffer& data, DataReaderWriter const& string)
             {
-                const_cast<Container&>(string.Value) = data.ReadString(string.Value.length());
-                data.read_skip<char>(); // null terminator
+                if (!string.Value.empty())
+                {
+                    const_cast<Container&>(string.Value) = data.ReadString(string.Value.length());
+                    (void)data.read<char>(); // null terminator
+                }
                 return data;
             }
         };
-- 
cgit v1.2.3