From abe37e458c2b482d478ce98ba44bc8dcf76caeb1 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Wed, 10 Aug 2016 16:02:22 +0200 Subject: Server/Database: Reduce differences between 3.3.5 and 6.x branches Cherry-pick 1bea52fd4649b6a1761aa157f9e74f01e19872e7 and 543bea32 to add support to TYPE_BINARY MySQL field type --- src/server/database/Database/Field.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/database/Database/Field.cpp') diff --git a/src/server/database/Database/Field.cpp b/src/server/database/Database/Field.cpp index 20a42871b91..efddd005c06 100644 --- a/src/server/database/Database/Field.cpp +++ b/src/server/database/Database/Field.cpp @@ -39,7 +39,7 @@ void Field::SetByteValue(void* newValue, enum_field_types newType, uint32 length data.raw = true; } -void Field::SetStructuredValue(char* newValue, enum_field_types newType) +void Field::SetStructuredValue(char* newValue, enum_field_types newType, uint32 length) { if (data.value) CleanUp(); @@ -47,10 +47,10 @@ 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; + data.value = new char[length + 1]; + memcpy(data.value, newValue, length); + *(reinterpret_cast(data.value) + length) = '\0'; + data.length = length; } data.type = newType; -- cgit v1.2.3