Core/DataStores: Fixed crash in hotfix packet building

Closes #19218

1 files changed, 38 insertions, 37 deletions

diff --git a/src/server/shared/DataStores/DB2Store.h b/src/server/shared/DataStores/DB2Store.h
index c12b83102a2..7011a3b6e61 100644
--- a/src/server/shared/DataStores/DB2Store.h
+++ b/src/server/shared/DataStores/DB2Store.h
@@ -33,8 +33,8 @@ public:
 
     virtual ~DB2StorageBase()
     {
-        delete[] reinterpret_cast<char*>(_dataTable);
-        delete[] reinterpret_cast<char*>(_dataTableEx);
+        delete[] _dataTable;
+        delete[] _dataTableEx;
         for (char* strings : _stringPool)
             delete[] strings;
     }
@@ -63,47 +63,48 @@ public:
 protected:
     void WriteRecordData(char const* entry, uint32 locale, ByteBuffer& buffer) const
     {
+        std::size_t i = 0;
         if (!_loadInfo.Meta->HasIndexFieldInData())
+        {
             entry += 4;
+            ++i;
+        }
 
-        for (uint32 i = 0; i < _loadInfo.Meta->FieldCount; ++i)
+        for (; i < _loadInfo.FieldCount; ++i)
         {
-            for (uint32 a = 0; a < _loadInfo.Meta->ArraySizes[i]; ++a)
+            switch (_loadInfo.TypesString[i])
             {
-                switch (_loadInfo.TypesString[i])
+                case FT_INT:
+                    buffer << *(uint32*)entry;
+                    entry += 4;
+                    break;
+                case FT_FLOAT:
+                    buffer << *(float*)entry;
+                    entry += 4;
+                    break;
+                case FT_BYTE:
+                    buffer << *(uint8*)entry;
+                    entry += 1;
+                    break;
+                case FT_SHORT:
+                    buffer << *(uint16*)entry;
+                    entry += 2;
+                    break;
+                case FT_STRING:
+                {
+                    LocalizedString* locStr = *(LocalizedString**)entry;
+                    if (locStr->Str[locale][0] == '\0')
+                        locale = 0;
+
+                    buffer << locStr->Str[locale];
+                    entry += sizeof(LocalizedString*);
+                    break;
+                }
+                case FT_STRING_NOT_LOCALIZED:
                 {
-                    case FT_INT:
-                        buffer << *(uint32*)entry;
-                        entry += 4;
-                        break;
-                    case FT_FLOAT:
-                        buffer << *(float*)entry;
-                        entry += 4;
-                        break;
-                    case FT_BYTE:
-                        buffer << *(uint8*)entry;
-                        entry += 1;
-                        break;
-                    case FT_SHORT:
-                        buffer << *(uint16*)entry;
-                        entry += 2;
-                        break;
-                    case FT_STRING:
-                    {
-                        LocalizedString* locStr = *(LocalizedString**)entry;
-                        if (locStr->Str[locale][0] == '\0')
-                            locale = 0;
-
-                        buffer << locStr->Str[locale];
-                        entry += sizeof(LocalizedString*);
-                        break;
-                    }
-                    case FT_STRING_NOT_LOCALIZED:
-                    {
-                        buffer << *(char const**)entry;
-                        entry += sizeof(char const*);
-                        break;
-                    }
+                    buffer << *(char const**)entry;
+                    entry += sizeof(char const*);
+                    break;
                 }
             }
         }