mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-29 16:53:30 +01:00
Guard against CLR exceptions when translating exceptions
Partially fixes #1138, need to decide what to do about structured exceptions.
This commit is contained in:
parent
d5959907f5
commit
a1aefce6e4
@ -33,6 +33,17 @@ namespace Catch {
|
|||||||
return Catch::Detail::stringify( [exception description] );
|
return Catch::Detail::stringify( [exception description] );
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
// Compiling a mixed mode project with MSVC means that CLR
|
||||||
|
// exceptions will be caught in (...) as well. However, these
|
||||||
|
// do not fill-in std::current_exception and thus lead to crash
|
||||||
|
// when attempting rethrow.
|
||||||
|
// /EHa switch also causes structured exceptions to be caught
|
||||||
|
// here, but they fill-in current_exception properly, so
|
||||||
|
// at worst the output should be a little weird, instead of
|
||||||
|
// causing a crash.
|
||||||
|
if (std::current_exception() == nullptr) {
|
||||||
|
return "Non C++ exception. Possibly a CLR exception.";
|
||||||
|
}
|
||||||
return tryTranslators();
|
return tryTranslators();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user