history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-04-27 10:45:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

CrashHandler: Use SetUnhandledExceptionFilter() and terminate on crash

Browse Source 
Fixes zombie processes sticking around.
This commit is contained in:
Stenzek 2024-05-05 21:48:20 +10:00
parent fa104acdd1
commit 4ca7753720
No known key found for this signature in database
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/crash_handler.cpp
View File

@ -76,7 +76,6 @@ static bool WriteMinidump(HMODULE hDbgHelp, HANDLE hFile, HANDLE hProcess, DWORD
static std::wstring s_write_directory; static std::wstring s_write_directory;
static DynamicLibrary s_dbghelp_module; static DynamicLibrary s_dbghelp_module;
static PVOID s_veh_handle = nullptr;
static bool s_in_crash_handler = false; static bool s_in_crash_handler = false;
static void GenerateCrashFilename(wchar_t* buf, size_t len, const wchar_t* prefix, const wchar_t* extension) static void GenerateCrashFilename(wchar_t* buf, size_t len, const wchar_t* prefix, const wchar_t* extension)
@ -138,32 +137,13 @@ static void WriteMinidumpAndCallstack(PEXCEPTION_POINTERS exi)
static LONG NTAPI ExceptionHandler(PEXCEPTION_POINTERS exi) static LONG NTAPI ExceptionHandler(PEXCEPTION_POINTERS exi)
{ {
if (s_in_crash_handler) // if the debugger is attached, or we're recursively crashing, let it take care of it.
return EXCEPTION_CONTINUE_SEARCH; if (!s_in_crash_handler)
WriteMinidumpAndCallstack(exi);
switch (exi->ExceptionRecord->ExceptionCode) // returning EXCEPTION_CONTINUE_SEARCH makes sense, except for the fact that it seems to leave zombie processes
{ // around. instead, force ourselves to terminate.
case EXCEPTION_ACCESS_VIOLATION: TerminateProcess(GetCurrentProcess(), 0xFEFEFEFEu);
case EXCEPTION_BREAKPOINT:
case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
case EXCEPTION_INT_DIVIDE_BY_ZERO:
case EXCEPTION_INT_OVERFLOW:
case EXCEPTION_PRIV_INSTRUCTION:
case EXCEPTION_ILLEGAL_INSTRUCTION:
case EXCEPTION_NONCONTINUABLE_EXCEPTION:
case EXCEPTION_STACK_OVERFLOW:
case EXCEPTION_GUARD_PAGE:
break;
default:
return EXCEPTION_CONTINUE_SEARCH;
}
// if the debugger is attached, let it take care of it.
if (IsDebuggerPresent())
return EXCEPTION_CONTINUE_SEARCH;
WriteMinidumpAndCallstack(exi);
return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
} }
@ -175,15 +155,12 @@ bool CrashHandler::Install()
if (mod) if (mod)
s_dbghelp_module.Adopt(mod); s_dbghelp_module.Adopt(mod);
s_veh_handle = AddVectoredExceptionHandler(0, ExceptionHandler); SetUnhandledExceptionFilter(ExceptionHandler);
return (s_veh_handle != nullptr); return true;
} }
void CrashHandler::SetWriteDirectory(std::string_view dump_directory) void CrashHandler::SetWriteDirectory(std::string_view dump_directory)
{ {
if (!s_veh_handle)
return;
s_write_directory = StringUtil::UTF8StringToWideString(dump_directory); s_write_directory = StringUtil::UTF8StringToWideString(dump_directory);
} }