diff options
| author | Léo Lam <leo@leolam.fr> | 2021-01-27 13:24:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 13:24:26 +0100 |
| commit | 305faa73ec5c646643db9b8526906480ada7c6fa (patch) | |
| tree | 368f15b4ae7cb55935b0d29ab4201c1c064b9da3 /Source/Core | |
| parent | 2537ea77ee33634a3ad6b616e8b0b5455046b87c (diff) | |
| parent | 2ba4fd960e20fc7e50280993967a6cd540fb77ab (diff) | |
Merge pull request #9436 from shuffle2/asan
msvc: enable asan compat
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/MemTools.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp index e0e0d6695b..813a2ef195 100644 --- a/Source/Core/Core/MemTools.cpp +++ b/Source/Core/Core/MemTools.cpp @@ -9,6 +9,7 @@ #include <cstring> #include <vector> +#include "Common/Assert.h" #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/MsgHandler.h" @@ -28,30 +29,32 @@ namespace EMM { #ifdef _WIN32 +static PVOID s_veh_handle; + static LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) { switch (pPtrs->ExceptionRecord->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: { - int accessType = (int)pPtrs->ExceptionRecord->ExceptionInformation[0]; - if (accessType == 8) // Rule out DEP + ULONG_PTR access_type = pPtrs->ExceptionRecord->ExceptionInformation[0]; + if (access_type == 8) // Rule out DEP { - return (DWORD)EXCEPTION_CONTINUE_SEARCH; + return EXCEPTION_CONTINUE_SEARCH; } // virtual address of the inaccessible data - uintptr_t badAddress = (uintptr_t)pPtrs->ExceptionRecord->ExceptionInformation[1]; - CONTEXT* ctx = pPtrs->ContextRecord; + uintptr_t fault_address = (uintptr_t)pPtrs->ExceptionRecord->ExceptionInformation[1]; + SContext* ctx = pPtrs->ContextRecord; - if (JitInterface::HandleFault(badAddress, ctx)) + if (JitInterface::HandleFault(fault_address, ctx)) { - return (DWORD)EXCEPTION_CONTINUE_EXECUTION; + return EXCEPTION_CONTINUE_EXECUTION; } else { // Let's not prevent debugging. - return (DWORD)EXCEPTION_CONTINUE_SEARCH; + return EXCEPTION_CONTINUE_SEARCH; } } @@ -84,18 +87,17 @@ static LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) void InstallExceptionHandler() { - // Make sure this is only called once per process execution - // Instead, could make a Uninstall function, but whatever.. - static bool handlerInstalled = false; - if (handlerInstalled) + if (s_veh_handle) return; - AddVectoredExceptionHandler(TRUE, Handler); - handlerInstalled = true; + s_veh_handle = AddVectoredExceptionHandler(TRUE, Handler); + ASSERT(s_veh_handle); } void UninstallExceptionHandler() { + ULONG status = RemoveVectoredExceptionHandler(s_veh_handle); + ASSERT(status); } #elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE) |
