In Cpp/Cx, empty Platform::String^ is null. Who knew?

dropbox · Dec 22, 2016 · 2f2be44 · 2f2be44
1 parent 0c9222a
commit 2f2be44
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/support-lib/cx/Marshal.h b/support-lib/cx/Marshal.h
@@ -110,10 +110,14 @@ namespace djinni {
 		using Boxed = String;
 
 		static CppType toCpp(CxType string) {
-			assert(string);
-			std::wstring wstring{ string->Data() };
-			std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;
-			return converter.to_bytes(wstring);
+			//Empty strings are null.
+			if(string)
+			{
+				std::wstring wstring{ string->Data() };
+				std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;
+				return converter.to_bytes(wstring);
+			}
+			return {""};
 		}
 
 		static CxType fromCpp(const CppType& string) {