From 1bea52fd4649b6a1761aa157f9e74f01e19872e7 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 21 Oct 2014 14:57:20 +0200 Subject: Core/DBLayer: Added support for BINARY field type --- src/server/shared/Database/Field.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/server/shared/Database/Field.cpp') diff --git a/src/server/shared/Database/Field.cpp b/src/server/shared/Database/Field.cpp index 866a96b58b6..f1741f98cc3 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) +void Field::SetStructuredValue(char* newValue, enum_field_types newType, uint32 length, bool isBinary) { if (data.value) CleanUp(); @@ -54,10 +54,16 @@ void Field::SetStructuredValue(char* newValue, enum_field_types newType) // This value stores somewhat structured data that needs function style casting if (newValue) { - size_t size = strlen(newValue); - data.value = new char [size+1]; - strcpy((char*)data.value, newValue); - data.length = size; + if (!isBinary) + { + data.value = new char[length + 1]; + *(reinterpret_cast(data.value) + length) = '\0'; + } + else + data.value = new char[length]; + + memcpy(data.value, newValue, length); + data.length = length; } data.type = newType; -- cgit v1.2.3