GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'string_set_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-string_set_fix

Browse Source
This commit is contained in:
Wojtek Figat
2023-06-13 15:00:08 +02:00
parent 13b1c16213 7cc2c143ab
commit c652bab9b2
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Engine/Core/Types/String.cpp
View File

@@ -34,22 +34,26 @@ String::String(const StringAnsiView& str)
void String::Set(const Char* chars, int32 length) void String::Set(const Char* chars, int32 length)
{ {
if (length != _length) ASSERT(length >= 0);
if (length == _length)
{ {
ASSERT(length >= 0); if (_data == chars)
Platform::Free(_data); return;
Platform::MemoryCopy(_data, chars, length * sizeof(Char));
}
else
{
Char* alloc = nullptr;
if (length != 0) if (length != 0)
{ {
_data = (Char*)Platform::Allocate((length + 1) * sizeof(Char), 16); alloc = (Char*)Platform::Allocate((length + 1) * sizeof(Char), 16);
_data[length] = 0; alloc[length] = 0;
} Platform::MemoryCopy(alloc, chars, length * sizeof(Char));
else
{
_data = nullptr;
} }
Platform::Free(_data);
_data = alloc;
_length = length; _length = length;
} }
Platform::MemoryCopy(_data, chars, length * sizeof(Char));
} }
void String::Set(const char* chars, int32 length) void String::Set(const char* chars, int32 length)