xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix String::Data copying/moving from self

Browse Source
This commit is contained in:
Maxime Coste 2017-08-23 18:13:42 +07:00
parent f7bed9eb18
commit da227e48e9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/string.cc
View File

@ -43,6 +43,9 @@ String::Data::Data(Data&& other) noexcept
String::Data& String::Data::operator=(const Data& other) String::Data& String::Data::operator=(const Data& other)
{ {
if (&other == this)
return *this;
const size_t new_size = other.size(); const size_t new_size = other.size();
reserve<false>(new_size); reserve<false>(new_size);
memcpy(data(), other.data(), new_size+1); memcpy(data(), other.data(), new_size+1);
@ -53,6 +56,9 @@ String::Data& String::Data::operator=(const Data& other)
String::Data& String::Data::operator=(Data&& other) noexcept String::Data& String::Data::operator=(Data&& other) noexcept
{ {
if (&other == this)
return *this;
release(); release();
if (other.is_long()) if (other.is_long())