From f8977a0f6ca99043445529e6bdce010432972058 Mon Sep 17 00:00:00 2001 From: Alexander Kyte Date: Thu, 16 Jun 2016 11:18:19 -0400 Subject: [PATCH] [runtime] Return early so mono_value_box_checked doesn't clobber error (#3172) --- mono/mini/mini-runtime.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c index 816a8965700..4baf5ab5195 100644 --- a/mono/mini/mini-runtime.c +++ b/mono/mini/mini-runtime.c @@ -2348,8 +2348,10 @@ mono_llvmonly_runtime_invoke (MonoMethod *method, RuntimeInvokeInfo *info, void runtime_invoke = (MonoObject *(*)(MonoObject *, void **, MonoObject **, void *))info->runtime_invoke; runtime_invoke (NULL, args, exc, info->compiled_method); - if (exc && *exc) + if (exc && *exc) { mono_error_set_exception_instance (error, (MonoException*) *exc); + return NULL; + } if (sig->ret->type != MONO_TYPE_VOID && info->ret_box_class) return mono_value_box_checked (domain, info->ret_box_class, retval, error); -- 2.25.1