Core/PacketIO: Fixed WorldPackets::SizedCString read function (it should not attempt to read null terminator if empty)

1 files changed, 5 insertions, 2 deletions

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;
             }
         };