Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-24 15:50:16 +01:00
Code Releases Wiki Activity

fix: Infinite loop on crash

Browse Source
This commit is contained in:
WerWolv 2023-12-20 13:38:13 +01:00
parent 1ea8269dec
commit bf6b2db0cb
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/gui/source/crash_handlers.cpp
View File

@ -85,11 +85,15 @@ 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 // 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(DEBUG)
#if defined(OS_WINDOWS) static bool breakpointTriggered = false;
__debugbreak(); if (!breakpointTriggered) {
#else breakpointTriggered = true;
raise(SIGTRAP); #if defined(OS_WINDOWS)
#endif __debugbreak();
#else
raise(SIGTRAP);
#endif
}
std::exit(signalNumber); std::exit(signalNumber);

14
main/gui/source/window/win_window.cpp
View File

@ -316,20 +316,6 @@ namespace hex {
g_oldWndProc = ::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)commonWindowProc); g_oldWndProc = ::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)commonWindowProc);
} }
// Add a custom exception handler to detect heap corruptions
{
::AddVectoredExceptionHandler(TRUE, [](PEXCEPTION_POINTERS exception) -> LONG {
if ((exception->ExceptionRecord->ExceptionCode & 0xF000'0000) == 0xC000'0000) {
log::fatal("Exception raised: 0x{:08X}", exception->ExceptionRecord->ExceptionCode);
if (exception->ExceptionRecord->ExceptionCode == STATUS_HEAP_CORRUPTION) {
log::fatal("Heap corruption detected!");
}
}
return EXCEPTION_CONTINUE_SEARCH;
});
}
// Set up a taskbar progress handler // Set up a taskbar progress handler
{ {
if (SUCCEEDED(CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED))) { if (SUCCEEDED(CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED))) {