Fix crash with String copy from with NULL string parameter
This commit is contained in:
parent
e5d890c23a
commit
4b2a44054a
1 changed files with 12 additions and 0 deletions
|
@ -96,6 +96,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)
|
||||
|
@ -119,6 +125,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)
|
||||
|
|
Loading…
Reference in a new issue