From c4a1cf4901a4e46cf72c71be6a14580fc22849d5 Mon Sep 17 00:00:00 2001 From: monojenkins Date: Tue, 2 Jun 2020 14:27:32 -0400 Subject: [PATCH] [runtime] Fix a case where crash chaining was broken (#37261) We must always have a call to mono_chain_signal() after mono_handle_native_crash(), in case signal chaining and crash chaining are both enabled. --- src/mono/mono/mini/mini-runtime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mono/mono/mini/mini-runtime.c b/src/mono/mono/mini/mini-runtime.c index ca2a59c..5401644 100644 --- a/src/mono/mono/mini/mini-runtime.c +++ b/src/mono/mono/mini/mini-runtime.c @@ -3605,6 +3605,10 @@ MONO_SIG_HANDLER_FUNC (, mono_sigsegv_signal_handler) } else { if (mono_dump_start ()) mono_handle_native_crash (mono_get_signame (SIGSEGV), &mctx, (MONO_SIG_HANDLER_INFO_TYPE*)info); + if (mono_do_crash_chaining) { + mono_chain_signal (MONO_SIG_HANDLER_PARAMS); + return; + } } #endif } -- 2.7.4