diff options
Diffstat (limited to 'src/vm/crossdomaincalls.cpp')
| -rw-r--r-- | src/vm/crossdomaincalls.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/vm/crossdomaincalls.cpp b/src/vm/crossdomaincalls.cpp index 955e81e02e..b528915a54 100644 --- a/src/vm/crossdomaincalls.cpp +++ b/src/vm/crossdomaincalls.cpp @@ -1148,8 +1148,10 @@ CrossDomainChannel::BlitAndCall() } } +#ifdef FEATURE_CORRUPTING_EXCEPTIONS // Assume that exception at server was NotCorrupting CorruptionSeverity severity = NotCorrupting; +#endif // FEATURE_CORRUPTING_EXCEPTIONS // Push the frame ENTER_DOMAIN_ID(m_pSrvDomain); @@ -1525,7 +1527,9 @@ struct MarshalAndCallArgs : public CtxTransitionBaseArgs UINT64 uRegTypeMap; #endif +#ifdef FEATURE_CORRUPTING_EXCEPTIONS CorruptionSeverity severity; +#endif // FEATURE_CORRUPTING_EXCEPTIONS }; // Simple wrapper to go from C to C++. @@ -2535,8 +2539,10 @@ CrossDomainChannel::MarshalAndCall() args.uRegTypeMap = *(UINT64*)pMap; #endif +#ifdef FEATURE_CORRUPTING_EXCEPTIONS // By default assume that exception thrown across the cross-AD call is NotCorrupting. args.severity = NotCorrupting; +#endif // FEATURE_CORRUPTING_EXCEPTIONS MakeCallWithPossibleAppDomainTransition(m_pSrvDomain, (FPAPPDOMAINCALLBACK) MarshalAndCall_Wrapper2, &args); } |