V2.x. Back-port PR #2334 to the v2.x branch#2581
Open
ScottHutchinson wants to merge 6 commits intocatchorg:v2.xfrom
Open
V2.x. Back-port PR #2334 to the v2.x branch#2581ScottHutchinson wants to merge 6 commits intocatchorg:v2.xfrom
ScottHutchinson wants to merge 6 commits intocatchorg:v2.xfrom
Conversation
Codecov Report
@@ Coverage Diff @@
## v2.x #2581 +/- ##
==========================================
- Coverage 90.08% 89.98% -0.10%
==========================================
Files 113 113
Lines 5040 5038 -2
==========================================
- Hits 4540 4533 -7
- Misses 500 505 +5 |
horenmar
reviewed
Dec 10, 2022
|
|
||
| }} // namespace MiscTests | ||
|
|
||
| #if defined(CATCH_PLATFORM_WINDOWS) |
Member
There was a problem hiding this comment.
The test in v3 only checks with MSVC. Why the change?
Contributor
Author
There was a problem hiding this comment.
I certainly didn't mean to change it.
horenmar
reviewed
Dec 10, 2022
| void FatalConditionHandler::disengage_platform() { | ||
| if (!RemoveVectoredExceptionHandler(exceptionHandlerHandle)) { | ||
| CATCH_RUNTIME_ERROR("Could not unregister vectored exception handler"); | ||
| if (SetUnhandledExceptionFilter(reinterpret_cast<LPTOP_LEVEL_EXCEPTION_FILTER>(previousTopLevelExceptionFilter)) != topLevelExceptionFilter) { |
Member
There was a problem hiding this comment.
Similar question: the code in v3 does not need the wild reinterpret cast. Why is it needed here?
Contributor
Author
There was a problem hiding this comment.
I thought sure I just copied the code from v3. I'll look at it no later than Monday. Thanks.
Member
|
otherwise lgtm |
shahsb
approved these changes
Apr 1, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR back-ports the PR #2334 to the v2.x branch, enabling v2.x to be used with the Address Sanitizer on Windows.