Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-17 18:59:21 +01:00
Code Releases Wiki Activity

fix: Crash loop when segfault gets triggered

Browse Source
This commit is contained in:
WerWolv 2023-08-25 23:51:51 +02:00
parent bd75b70d85
commit e487fd7450
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
main/source/crash_handlers.cpp
View File

@ -84,16 +84,24 @@ namespace hex::crash {
// Trigger a breakpoint if we're in a debug build or raise the signal again for the default handler to handle it
#if defined(DEBUG)
#if defined(OS_WINDOWS)
__debugbreak();
#else
raise(SIGTRAP);
#endif
if (signalNumber == 0) {
#if defined(OS_WINDOWS)
__debugbreak();
#else
raise(SIGTRAP);
#endif
} else {
std::exit(signalNumber);
}
#else
if (signalNumber == 0)
std::abort();
else
std::exit(signalNumber);
#endif
}
@ -147,14 +155,15 @@ namespace hex::crash {
void setupCrashHandlers() {
// Register signal handlers
{
#define HANDLE_SIGNAL(name) \
std::signal(name, [](int signalNumber){ \
signalHandler(signalNumber, #name); \
#define HANDLE_SIGNAL(name) \
std::signal(name, [](int signalNumber) { \
signalHandler(signalNumber, #name); \
})
for (auto signal : Signals) {
HANDLE_SIGNAL(signal);
}
HANDLE_SIGNAL(SIGSEGV);
HANDLE_SIGNAL(SIGILL);
HANDLE_SIGNAL(SIGABRT);
HANDLE_SIGNAL(SIGFPE);
#undef HANDLE_SIGNAL
}