Core/DBLayer: Fixed a few mismatched types and possible invalid memory access with aggregate fields in queries

4 files changed, 13 insertions, 13 deletions

diff --git a/src/server/shared/Database/Field.cpp b/src/server/shared/Database/Field.cpp
index f1741f98cc3..da547d3a151 100644
--- a/src/server/shared/Database/Field.cpp
+++ b/src/server/shared/Database/Field.cpp
@@ -46,7 +46,7 @@ void Field::SetByteValue(const void* newValue, const size_t newSize, enum_field_
     data.raw = true;
 }
 
-void Field::SetStructuredValue(char* newValue, enum_field_types newType, uint32 length, bool isBinary)
+void Field::SetStructuredValue(char* newValue, enum_field_types newType, uint32 length)
 {
     if (data.value)
         CleanUp();
@@ -54,15 +54,9 @@ void Field::SetStructuredValue(char* newValue, enum_field_types newType, uint32
     // This value stores somewhat structured data that needs function style casting
     if (newValue)
     {
-        if (!isBinary)
-        {
-            data.value = new char[length + 1];
-            *(reinterpret_cast<char*>(data.value) + length) = '\0';
-        }
-        else
-            data.value = new char[length];
-
+        data.value = new char[length + 1];
         memcpy(data.value, newValue, length);
+        *(reinterpret_cast<char*>(data.value) + length) = '\0';
         data.length = length;
     }
 
diff --git a/src/server/shared/Database/Field.h b/src/server/shared/Database/Field.h
index 99f98572a56..352db10c539 100644
--- a/src/server/shared/Database/Field.h
+++ b/src/server/shared/Database/Field.h
@@ -239,9 +239,11 @@ class Field
             {
                 char const* string = GetCString();
                 if (!string)
-                    string = "";
+                    return "";
+
                 return std::string(string, data.length);
             }
+
             return std::string((char*)data.value, data.length);
         }
 
@@ -284,7 +286,7 @@ class Field
         #endif
 
         void SetByteValue(void const* newValue, size_t const newSize, enum_field_types newType, uint32 length);
-        void SetStructuredValue(char* newValue, enum_field_types newType, uint32 length, bool isBinary);
+        void SetStructuredValue(char* newValue, enum_field_types newType, uint32 length);
 
         void CleanUp()
         {
diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp
index 1f036b5bf0a..3ea3c969a4c 100644
--- a/src/server/shared/Database/PreparedStatement.cpp
+++ b/src/server/shared/Database/PreparedStatement.cpp
@@ -72,6 +72,7 @@ void PreparedStatement::BindParameters()
                 break;
             case TYPE_BINARY:
                 m_stmt->setBinary(i, statement_data[i].binary, false);
+                break;
             case TYPE_NULL:
                 m_stmt->setNull(i);
                 break;
@@ -357,7 +358,7 @@ void MySQLPreparedStatement::setBinary(const uint8 index, const std::vector<uint
     m_paramsSet[index] = true;
     MYSQL_BIND* param = &m_bind[index];
     size_t len = value.size();
-    param->buffer_type = MYSQL_TYPE_VAR_STRING;
+    param->buffer_type = MYSQL_TYPE_BLOB;
     delete [] static_cast<char *>(param->buffer);
     param->buffer = new char[len];
     param->buffer_length = len;
@@ -365,7 +366,10 @@ void MySQLPreparedStatement::setBinary(const uint8 index, const std::vector<uint
     delete param->length;
     param->length = new unsigned long(len);
     if (isString)
+    {
         *param->length -= 1;
+        param->buffer_type = MYSQL_TYPE_VAR_STRING;
+    }
 
     memcpy(param->buffer, value.data(), len);
 }
diff --git a/src/server/shared/Database/QueryResult.cpp b/src/server/shared/Database/QueryResult.cpp
index a6d9c64622a..154cf5cda41 100644
--- a/src/server/shared/Database/QueryResult.cpp
+++ b/src/server/shared/Database/QueryResult.cpp
@@ -172,7 +172,7 @@ bool ResultSet::NextRow()
     }
 
     for (uint32 i = 0; i < _fieldCount; i++)
-        _currentRow[i].SetStructuredValue(row[i], _fields[i].type, lengths[i], (_fields[i].flags & BINARY_FLAG) != 0);
+        _currentRow[i].SetStructuredValue(row[i], _fields[i].type, lengths[i]);
 
     return true;
 }