From 0e830baba632125cfaa5e1c88cace48b830ab8e3 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Tue, 29 Mar 2016 17:09:05 -0400 Subject: [PATCH] [runtime] Don't call mono_raise_exception in ves_icall_Mono_Runtime_GetNativeStackTrace --- mono/metadata/exception.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mono/metadata/exception.c b/mono/metadata/exception.c index 332ac557d1e..e2e162f702a 100644 --- a/mono/metadata/exception.c +++ b/mono/metadata/exception.c @@ -940,8 +940,10 @@ ves_icall_Mono_Runtime_GetNativeStackTrace (MonoException *exc) { char *trace; MonoString *res; - if (!exc) - mono_raise_exception (mono_get_exception_argument_null ("exception")); + if (!exc) { + mono_set_pending_exception (mono_get_exception_argument_null ("exception")); + return NULL; + } trace = mono_exception_get_native_backtrace (exc); res = mono_string_new (mono_domain_get (), trace); -- 2.11.4.GIT