From 5246659f8cd35f119df65822b72777bdb4dbcea5 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sun, 19 Nov 2023 23:40:18 +0000 Subject: [PATCH] Merge branch 'remove-malloc-in-signal-handler' into 'master' Remove malloc from I_ReportSignal See merge request KartKrew/Kart!1650 --- src/sdl/i_system.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index ff3676158..f769b84a0 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -28,7 +28,7 @@ #else #include "../config.h.in" #endif - +#include #include #ifdef _WIN32 @@ -347,6 +347,16 @@ static void I_ReportSignal(int num, int coredumped) SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Process killed by signal", sigmsg, NULL); + + I_ShowErrorMessageBox(sigmsg, +#if defined (UNIXBACKTRACE) + true +#elif defined (_WIN32) + !M_CheckParm("-noexchndl") +#else + false +#endif + ); } #ifndef NEWSIGNALHANDLER