Fix CString::assign(const String&) - must invalidate if source not va…

…lid. Add begin() method.
SmingHub · Nov 26, 2020 · cfeac1f · cfeac1f
1 parent 0935546
commit cfeac1f
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Sming/Core/Data/CString.h b/Sming/Core/Data/CString.h
@@ -36,7 +36,11 @@ class CString : public std::unique_ptr<char[]>
 
 	void assign(const String& src)
 	{
-		assign(src.c_str(), src.length());
+		if(src) {
+			assign(src.c_str(), src.length());
+		} else {
+			reset();
+		}
 	}
 
 	void assign(const char* src)
@@ -67,6 +71,11 @@ class CString : public std::unique_ptr<char[]>
 		return *this;
 	}
 
+	char* begin()
+	{
+		return get();
+	}
+
 	const char* c_str() const
 	{
 		return get() ?: "";