Core/PacketIO: Fixed SMSG_DB_REPLY structure

2 files changed, 7 insertions, 2 deletions

diff --git a/src/server/shared/DataStores/DB2Store.h b/src/server/shared/DataStores/DB2Store.h
index c4ca929065b..9514f34b294 100644
--- a/src/server/shared/DataStores/DB2Store.h
+++ b/src/server/shared/DataStores/DB2Store.h
@@ -80,8 +80,7 @@ void WriteDB2RecordToPacket(DB2Storage<T> const& store, uint32 id, uint32 locale
                 char const* str = locStr->Str[locale];
                 size_t len = strlen(str);
                 buffer << uint16(len);
-                if (len)
-                    buffer << str;
+                buffer.WriteString(str, len);
                 entry += sizeof(char*);
                 break;
             }
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index 1063883d217..afa10207321 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -544,6 +544,12 @@ class ByteBuffer
                 append(str.c_str(), len);
         }
 
+        void WriteString(char const* str, size_t len)
+        {
+            if (len)
+                append(str, len);
+        }
+
         uint32 ReadPackedTime()
         {
             uint32 packedDate = read<uint32>();