From 8664977b6989268082dd573d4f67a2520020e9b8 Mon Sep 17 00:00:00 2001 From: Ben Maurer Date: Sun, 7 Nov 2004 17:30:57 +0000 Subject: [PATCH] wack-a-mole time... svn path=/trunk/mono/; revision=35782 --- mono/metadata/marshal.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c index e6b2804794c..7557fca01b1 100644 --- 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); } -- 2.25.1