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

Fix undefined behavior in String::operator+=(const String &)

Browse Source
This commit is contained in:
kleonc 2022-08-18 14:24:14 +02:00
parent 03dc8c5d6f
commit 1324ca5eb0
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);
const char32_t *src = p_str.get_data();
const char32_t *src = p_str.ptr();
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;
}