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

1 files changed, 4 insertions, 2 deletions

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()
         {