X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fstring-icalls.c;h=fe801f1c70970faba58f19b69aabf8778738f62f;hb=98295e398b22d82520f9240a1d298a6cdc68cf8c;hp=b2554a7c11eb180ef29615223cc8bd901a991ffb;hpb=748159656e718fb180faed15e4f0b2fe3d6918b2;p=mono.git

diff --git a/mono/metadata/string-icalls.c b/mono/metadata/string-icalls.c
index b2554a7c11e..fe801f1c709 100644
--- a/mono/metadata/string-icalls.c
+++ b/mono/metadata/string-icalls.c
@@ -64,11 +64,10 @@ ves_icall_System_String_ctor_charp (gpointer dummy, gunichar2 *value)
 	domain = mono_domain_get ();
 
 	if (value == NULL)
-		length = 0;
-	else {
-		for (i = 0; *(value + i) != '\0'; i++);
-		length = i;
-	}
+		return empty_string (domain);
+
+	for (i = 0; *(value + i) != '\0'; i++);
+	length = i;
 
 	return mono_string_new_utf16 (domain, value, length);
 }