Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Add two missing #ifdef related with FEATURE_CORRUPTING_EXCEPTIONS #8850

Merged
merged 1 commit into from
Jan 9, 2017
Merged

Add two missing #ifdef related with FEATURE_CORRUPTING_EXCEPTIONS #8850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/vm/excep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8986,11 +8986,13 @@ LONG ReflectionInvocationExceptionFilter(
#else // !(_WIN64 || _TARGET_X86_)
#error Unsupported platform
#endif // _WIN64


#ifdef FEATURE_CORRUPTING_EXCEPTIONS
if (pEHTracker->GetCorruptionSeverity() == ProcessCorrupting)
{
EEPolicy::HandleFatalError(COR_E_FAILFAST, reinterpret_cast<UINT_PTR>(pExceptionInfo->ExceptionRecord->ExceptionAddress), NULL, pExceptionInfo);
}
#endif // FEATURE_CORRUPTING_EXCEPTIONS
}

return ret;
Expand Down
2 changes: 2 additions & 0 deletions src/vm/exceptionhandling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4662,6 +4662,7 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar
ThreadExceptionState * pCurTES = pCurThread->GetExceptionState();
_ASSERTE(pCurTES != NULL);

#ifdef FEATURE_CORRUPTING_EXCEPTIONS
ExceptionTracker* pEHTracker = pCurTES->GetCurrentExceptionTracker();
if (pEHTracker == NULL)
{
Expand All @@ -4673,6 +4674,7 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar

pCurTES->SetLastActiveExceptionCorruptionSeverity(severity);
}
#endif // FEATURE_CORRUPTING_EXCEPTIONS
}

throw std::move(ex);
Expand Down