wack-a-mole time...

svn path=/trunk/mono/; revision=35782

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index e6b2804794c74c27991be22df3190b8cee5de803..7557fca01b1cda4d0d87a5e710775492d38416a2 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -5831,9 +5831,11 @@ ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAnsi_len (char *ptr,
 {
        MONO_ARCH_SAVE_REGS;
 
-       if (ptr == NULL)
+       if (ptr == NULL) {
                mono_raise_exception (mono_get_exception_argument_null ("ptr"));
-       else
+               g_assert_not_reached ();
+               return NULL;
+       } else
                return mono_string_new_len (mono_domain_get (), ptr, len);
 }
 
@@ -5862,9 +5864,11 @@ ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringUni_len (guint16 *pt
 
        MONO_ARCH_SAVE_REGS;
 
-       if (ptr == NULL)
+       if (ptr == NULL) {
                mono_raise_exception (mono_get_exception_argument_null ("ptr"));
-       else
+               g_assert_not_reached ();
+               return NULL;
+       } else
                return mono_string_new_utf16 (domain, ptr, len);
 }