2006-08-22 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / mono / metadata / string-icalls.c

diff --git a/mono/metadata/string-icalls.c b/mono/metadata/string-icalls.c
index b2554a7c11eb180ef29615223cc8bd901a991ffb..fe801f1c70970faba58f19b69aabf8778738f62f 100644 (file)
--- 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);
 }