diff --git a/core/ustring.cpp b/core/ustring.cpp index 394c68516a..dfa67e36ab 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -64,6 +64,12 @@ const char *CharString::get_data() const { void String::copy_from(const char *p_cstr) { + if (!p_cstr) { + + resize(0); + return; + } + int len = 0; const char *ptr = p_cstr; while (*(ptr++) != 0) @@ -87,6 +93,12 @@ void String::copy_from(const char *p_cstr) { void String::copy_from(const CharType *p_cstr, int p_clip_to) { + if (!p_cstr) { + + resize(0); + return; + } + int len = 0; const CharType *ptr = p_cstr; while (*(ptr++) != 0)