apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

libluna: Leave String in a valid state when moved

Browse Source
This commit is contained in:
apio 2023-04-28 21:16:11 +02:00
parent ae7c841fff
commit 8adfb6fdb9
Signed by: apio
GPG Key ID: B8A7D06E42258954
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libluna/include/luna/String.h
View File

@ -91,5 +91,7 @@ class String
usize m_length { 0 }; usize m_length { 0 };
void empty();
static Result<String> vformat(StringView fmt, va_list ap); static Result<String> vformat(StringView fmt, va_list ap);
}; };

9
libluna/src/String.cpp
View File

@ -5,6 +5,11 @@
#include <luna/Vector.h> #include <luna/Vector.h>
String::String() String::String()
{
empty();
}
void String::empty()
{ {
m_inline = true; m_inline = true;
m_length = 0; m_length = 0;
@ -20,7 +25,7 @@ String::String(String&& other)
if (m_inline) memcpy(m_inline_storage, other.m_inline_storage, sizeof(m_inline_storage)); if (m_inline) memcpy(m_inline_storage, other.m_inline_storage, sizeof(m_inline_storage));
other.m_string = nullptr; other.empty();
} }
String& String::operator=(String&& other) String& String::operator=(String&& other)
@ -36,7 +41,7 @@ String& String::operator=(String&& other)
if (m_inline) memcpy(m_inline_storage, other.m_inline_storage, sizeof(m_inline_storage)); if (m_inline) memcpy(m_inline_storage, other.m_inline_storage, sizeof(m_inline_storage));
other.m_string = nullptr; other.empty();
return *this; return *this;
} }