3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-31 12:17:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed SEH deregistration on Windows

Browse Source 
Should fix #796
This commit is contained in:
Martin Hořeňovský
2017-01-30 19:54:16 +01:00
parent c97ada1910
commit 38af8d7035
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/internal/catch_fatal_condition.hpp
View File

@@ -59,9 +59,9 @@ namespace Catch {
// 32k seems enough for Catch to handle stack overflow, // 32k seems enough for Catch to handle stack overflow,
// but the value was found experimentally, so there is no strong guarantee // but the value was found experimentally, so there is no strong guarantee
FatalConditionHandler():m_isSet(true), m_guaranteeSize(32 * 1024) { FatalConditionHandler():m_isSet(true), m_guaranteeSize(32 * 1024), m_exceptionHandlerHandle(CATCH_NULL) {
// Register as first handler in current chain // Register as first handler in current chain
AddVectoredExceptionHandler(1, handleVectoredException); m_exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
// Pass in guarantee size to be filled // Pass in guarantee size to be filled
SetThreadStackGuarantee(&m_guaranteeSize); SetThreadStackGuarantee(&m_guaranteeSize);
} }
@@ -69,8 +69,9 @@ namespace Catch {
void reset() { void reset() {
if (m_isSet) { if (m_isSet) {
// Unregister handler and restore the old guarantee // Unregister handler and restore the old guarantee
RemoveVectoredExceptionHandler(handleVectoredException); RemoveVectoredExceptionHandler(m_exceptionHandlerHandle);
SetThreadStackGuarantee(&m_guaranteeSize); SetThreadStackGuarantee(&m_guaranteeSize);
m_exceptionHandlerHandle = CATCH_NULL;
m_isSet = false; m_isSet = false;
} }
} }
@@ -81,6 +82,7 @@ namespace Catch {
private: private:
bool m_isSet; bool m_isSet;
ULONG m_guaranteeSize; ULONG m_guaranteeSize;
PVOID m_exceptionHandlerHandle;
}; };
} // namespace Catch } // namespace Catch