3 files changed, 11 insertions, 5 deletions
diff --git a/src/server/shared/Database/Field.cpp b/src/server/shared/Database/Field.cpp
index 7afcbdfedaf..552b93b42da 100644
--- a/src/server/shared/Database/Field.cpp
+++ b/src/server/shared/Database/Field.cpp
@@ -32,10 +32,13 @@ Field::~Field()
 
 void Field::SetByteValue(const void* newValue, const size_t newSize, enum_field_types newType, uint32 length)
 {
+    if (data.value)
+        CleanUp();
+
     // This value stores raw bytes that have to be explicitly casted later
     if (newValue)
     {
-        data.value = new char [newSize];
+        data.value = new char[newSize];
         memcpy(data.value, newValue, newSize);
         data.length = length;
     }
@@ -43,8 +46,11 @@ void Field::SetByteValue(const void* newValue, const size_t newSize, enum_field_
     data.raw = true;
 }
 
-void Field::SetStructuredValue(char* newValue, enum_field_types newType, const size_t newSize)
+void Field::SetStructuredValue(char* newValue, enum_field_types newType)
 {
+    if (data.value)
+        CleanUp();
+
     // This value stores somewhat structured data that needs function style casting
     if (newValue)
     {
diff --git a/src/server/shared/Database/Field.h b/src/server/shared/Database/Field.h
index 42260f41d9e..04112c12994 100644
--- a/src/server/shared/Database/Field.h
+++ b/src/server/shared/Database/Field.h
@@ -249,11 +249,11 @@ class Field
         } data;
 
         void SetByteValue(const void* newValue, const size_t newSize, enum_field_types newType, uint32 length);
-        void SetStructuredValue(char* newValue, enum_field_types newType, const size_t newSize);
+        void SetStructuredValue(char* newValue, enum_field_types newType);
         
         void CleanUp()
         {
-            delete[] (data.value);
+            delete[] ((char*)data.value);
             data.value = NULL;
         }
 
diff --git a/src/server/shared/Database/QueryResult.cpp b/src/server/shared/Database/QueryResult.cpp
index bd02e11385c..a887b1a9a36 100644
--- a/src/server/shared/Database/QueryResult.cpp
+++ b/src/server/shared/Database/QueryResult.cpp
@@ -162,7 +162,7 @@ bool ResultSet::NextRow()
     }
 
     for (uint32 i = 0; i < m_fieldCount; i++)
-        m_currentRow[i].SetStructuredValue(row[i], m_fields[i].type, Field::SizeForType(&m_fields[i]));
+        m_currentRow[i].SetStructuredValue(row[i], m_fields[i].type);
 
     return true;
 }