godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64571 from kleonc/string-fix-self-add-assign

Browse Source
This commit is contained in:
Rémi Verschelde 2022-08-22 22:24:12 +02:00 committed by GitHub
commit dac25e5c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/string/ustring.cpp
View File

@ -531,10 +531,12 @@ String &String::operator+=(const String &p_str) {
resize(lhs_len + rhs_len + 1); resize(lhs_len + rhs_len + 1);
const char32_t *src = p_str.get_data(); const char32_t *src = p_str.ptr();
char32_t *dst = ptrw() + lhs_len; char32_t *dst = ptrw() + lhs_len;
memcpy(dst, src, (rhs_len + 1) * sizeof(char32_t)); // Don't copy the terminating null with `memcpy` to avoid undefined behavior when string is being added to itself (it would overlap the destination).
memcpy(dst, src, rhs_len * sizeof(char32_t));
*(dst + rhs_len) = _null;
return *this; return *this;
} }