From e35dc9e0974da23276d6938e82f2e1057ed4fb92 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 23 Feb 2026 16:20:48 +0100 Subject: [PATCH] fix g_in_exiting_signal_handler every "flag" set by signal handlers must be of type "volatile sig_atomic_t" everything else may fail to be correctly set, read or get optimized away which rendered this basically useless --- src/console.c | 10 +++++----- src/dedicated/i_system.c | 7 ++++++- src/i_system.h | 2 +- src/m_menu.c | 10 +++++----- src/sdl/i_system.cpp | 11 ++++++++--- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/console.c b/src/console.c index 88fe25000..09ac2e36d 100644 --- a/src/console.c +++ b/src/console.c @@ -46,16 +46,16 @@ #ifdef HAVE_THREADS I_mutex con_mutex; -// g_in_exiting_signal_handler is an evil hack +// I_In_Exiting_Signal_Handler is an evil hack // to avoid infinite SIGABRT recursion in the signal handler // due to poisoned locks or mach-o kernel not supporting locks in signals // or something like that. idk -# define Lock_state() if (!g_in_exiting_signal_handler) { I_lock_mutex(&con_mutex); } -# define Unlock_state() if (!g_in_exiting_signal_handler) { I_unlock_mutex(con_mutex); } -#else/*HAVE_THREADS*/ +# define Lock_state() if (!I_In_Exiting_Signal_Handler()) { I_LockMutex(&con_mutex); } +# define Unlock_state() if (!I_In_Exiting_Signal_Handler()) { I_UnlockMutex(con_mutex); } +#else /*HAVE_THREADS*/ # define Lock_state() # define Unlock_state() -#endif/*HAVE_THREADS*/ +#endif /*HAVE_THREADS*/ static boolean con_started = false; // console has been initialised boolean con_startup = false; // true at game startup, screen need refreshing diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c index 311e936f3..f6450134c 100644 --- a/src/dedicated/i_system.c +++ b/src/dedicated/i_system.c @@ -984,7 +984,7 @@ void I_SleepDuration(precise_t duration) #endif } -boolean g_in_exiting_signal_handler = false; +static volatile sig_atomic_t g_in_exiting_signal_handler = false; static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg) { @@ -1048,6 +1048,11 @@ static void I_ReportSignal(int num, int coredumped) I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg); } +boolean I_In_Exiting_Signal_Handler(void) +{ + return g_in_exiting_signal_handler; +} + #ifndef NEWSIGNALHANDLER FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num) { diff --git a/src/i_system.h b/src/i_system.h index 958703a35..45767f1f7 100644 --- a/src/i_system.h +++ b/src/i_system.h @@ -43,7 +43,7 @@ extern UINT8 graphics_started; extern UINT8 keyboard_started; /** \brief Set to true when inside a signal handler that will exit the program. */ -extern boolean g_in_exiting_signal_handler; +boolean I_In_Exiting_Signal_Handler(void); /** \brief The I_GetFreeMem function diff --git a/src/m_menu.c b/src/m_menu.c index 0e753f621..f2b3ac1bb 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -4016,16 +4016,16 @@ boolean replaynamesloaded = false; #ifdef HAVE_THREADS I_mutex replayquerymutex; -// g_in_exiting_signal_handler is an evil hack +// I_In_Exiting_Signal_Handler is an evil hack // to avoid infinite SIGABRT recursion in the signal handler // due to poisoned locks or mach-o kernel not supporting locks in signals // or something like that. idk -# define Lock_search_state() if (!g_in_exiting_signal_handler) { I_lock_mutex(&replayquerymutex); } -# define Unlock_search_state() if (!g_in_exiting_signal_handler) { I_unlock_mutex(replayquerymutex); } -#else/*HAVE_THREADS*/ +# define Lock_search_state() if (!I_In_Exiting_Signal_Handler()) { I_LockMutex(&replayquerymutex); } +# define Unlock_search_state() if (!I_In_Exiting_Signal_Handler()) { I_UnlockMutex(replayquerymutex); } +#else /*HAVE_THREADS*/ # define Lock_search_state() # define Unlock_search_state() -#endif/*HAVE_THREADS*/ +#endif /*HAVE_THREADS*/ #define MAXREPLAYQUERY 37 diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 063b140e1..5310cc855 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -1577,7 +1577,7 @@ static void write_backtrace(bt_crash_reason_t reason) static std::thread::id g_main_thread_id; #endif -boolean g_in_exiting_signal_handler = false; +static volatile sig_atomic_t g_in_exiting_signal_handler = false; static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg, char *signal_name) { @@ -1712,6 +1712,11 @@ static void I_ReportSignal(int num, int coredumped) I_ShowErrorBox(sigttl, sigmsg); } +boolean I_In_Exiting_Signal_Handler(void) +{ + return g_in_exiting_signal_handler; +} + #ifndef NEWSIGNALHANDLER FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num) { @@ -1741,7 +1746,7 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num) } #endif -static volatile sig_atomic_t interrupted = 0; +static volatile sig_atomic_t interrupted = false; boolean I_Interrupted(void) { @@ -1751,7 +1756,7 @@ boolean I_Interrupted(void) static void quit_handler(int num) { (void)num; - interrupted = 1; + interrupted = true; } static void I_RegisterSignals(void)