From 4b2a44054a70020bbbad14a710cc92042834a9c1 Mon Sep 17 00:00:00 2001
From: geequlim <geequlim@gmail.com>
Date: Sun, 25 Jun 2017 21:57:06 +0800
Subject: Fix crash with String copy from with NULL string parameter

---
 core/ustring.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'core')

diff --git a/core/ustring.cpp b/core/ustring.cpp
index 7ccf7fd209..ab4528e495 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -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)
-- 
cgit v1.2.3