Merge pull request #9477 from shuffle2/asan

windows: fix unregistering VEH
dolphin-emu · Jan 27, 2021 · bb121dc · bb121dc
2 parents 305faa7 + a02a629
commit bb121dc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp
@@ -87,9 +87,7 @@ static LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs)
 
 void InstallExceptionHandler()
 {
-  if (s_veh_handle)
-    return;
-
+  ASSERT(!s_veh_handle);
   s_veh_handle = AddVectoredExceptionHandler(TRUE, Handler);
   ASSERT(s_veh_handle);
 }
@@ -98,6 +96,8 @@ void UninstallExceptionHandler()
 {
   ULONG status = RemoveVectoredExceptionHandler(s_veh_handle);
   ASSERT(status);
+  if (status)
+    s_veh_handle = nullptr;
 }
 
 #elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE)