diff options
| author | Abseil Team <absl-team@google.com> | 2023-06-30 17:32:13 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-06-30 17:32:57 (GMT) |
| commit | 1f531be3a19055d1402ec6476c5cab80492d3c68 (patch) | |
| tree | b17de07c9cd8210a74fb5d6a0a610d4f1efe8529 /googletest/src/gtest-internal-inl.h | |
| parent | 251e720391e92ab1aec845c7fd8ecdda35737f39 (diff) | |
| download | googletest-1f531be3a19055d1402ec6476c5cab80492d3c68.zip googletest-1f531be3a19055d1402ec6476c5cab80492d3c68.tar.gz googletest-1f531be3a19055d1402ec6476c5cab80492d3c68.tar.bz2 | |
Make GoogleTest handle SEH exceptions before stack unwinding rather than afterward
This ensure the erroring stack frame is visible and accessible when the handler is invoked.
Fixes #4298
PiperOrigin-RevId: 544692549
Change-Id: Ia165a8c293e8edc820da5f5ad4416546fffe2493
Diffstat (limited to 'googletest/src/gtest-internal-inl.h')
| -rw-r--r-- | googletest/src/gtest-internal-inl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/src/gtest-internal-inl.h b/googletest/src/gtest-internal-inl.h index be82166..1e9b5c2 100644 --- a/googletest/src/gtest-internal-inl.h +++ b/googletest/src/gtest-internal-inl.h @@ -387,10 +387,10 @@ class GTEST_API_ UnitTestOptions { #ifdef GTEST_OS_WINDOWS // Function for supporting the gtest_catch_exception flag. - // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the - // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise. + // Returns EXCEPTION_EXECUTE_HANDLER if given SEH exception was handled, or + // EXCEPTION_CONTINUE_SEARCH otherwise. // This function is useful as an __except condition. - static int GTestShouldProcessSEH(DWORD exception_code); + static int GTestProcessSEH(DWORD seh_code, const char* location); #endif // GTEST_OS_WINDOWS // Returns true if "name" matches the ':' separated list of glob-style |