R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash whitelist not working on client.dll

Browse Source 
Unregister gamesdk's crash handler if -noworkerdll is passed. This is required as both crashhandlers will be called during an exception, and on one, the whitelist wouldn't work.
This commit is contained in:
Kawe Mazidjatari 2023-01-31 21:48:42 +01:00
parent ad71360dcd
commit 281addc68e
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
r5dev/core/dllmain.cpp
View File

@ -11,6 +11,7 @@
#include "windows/system.h"
#include "mathlib/mathlib.h"
#include "launcher/launcher.h"
#include "public/utility/crashhandler.h"
//#############################################################################
// INITIALIZATION
@ -109,6 +110,11 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpReserved)
{
SDK_Init();
}
else // Destroy crash handler.
{
g_CrashHandler->~CCrashHandler();
g_CrashHandler = nullptr;
}
break;
}

24
r5dev/public/utility/crashhandler.cpp
View File

@ -581,6 +581,26 @@ long __stdcall BottomLevelExceptionFilter(EXCEPTION_POINTERS* pExceptionInfo)
return EXCEPTION_EXECUTE_HANDLER;
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CCrashHandler::Init()
{
m_hExceptionHandler = AddVectoredExceptionHandler(TRUE, BottomLevelExceptionFilter);
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CCrashHandler::Shutdown()
{
if (m_hExceptionHandler)
{
RemoveVectoredExceptionHandler(m_hExceptionHandler);
m_hExceptionHandler = nullptr;
}
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
@ -593,7 +613,7 @@ CCrashHandler::CCrashHandler()
, m_bExceptionHandled(false)
, m_bCrashMsgCreated(false)
{
m_hExceptionHandler = AddVectoredExceptionHandler(TRUE, BottomLevelExceptionFilter);
Init();
}
//-----------------------------------------------------------------------------
@ -601,7 +621,7 @@ CCrashHandler::CCrashHandler()
//-----------------------------------------------------------------------------
CCrashHandler::~CCrashHandler()
{
RemoveVectoredExceptionHandler(m_hExceptionHandler);
Shutdown();
}
CCrashHandler* g_CrashHandler = new CCrashHandler();

3
r5dev/public/utility/crashhandler.h
View File

@ -10,6 +10,9 @@ public:
CCrashHandler();
~CCrashHandler();
void Init();
void Shutdown();
//-------------------------------------------------------------------------
// Inlines:
//-------------------------------------------------------------------------