From d3c3bbfff259642ec9508a4ed713c1989de2297d Mon Sep 17 00:00:00 2001 From: John Chen Date: Tue, 3 Nov 2015 10:23:19 -0800 Subject: Fix assert / access violation in PEDeocder due to change from GitHub Recent change on GitHub to modify platform ID of Unix platforms caused issues with desktop CLR. [tfs-changeset: 1544631] --- src/inc/pedecoder.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/inc/pedecoder.inl') diff --git a/src/inc/pedecoder.inl b/src/inc/pedecoder.inl index 12b00d21ec..f99d76d1ba 100644 --- a/src/inc/pedecoder.inl +++ b/src/inc/pedecoder.inl @@ -962,7 +962,7 @@ inline BOOL PEDecoder::IsNativeMachineFormat() const if (!HasContents() || !HasNTHeaders() ) return FALSE; _ASSERTE(m_pNTHeaders); - WORD expectedFormat = (HasNativeHeader() || HasReadyToRunHeader()) ? + WORD expectedFormat = HasCorHeader() && (HasNativeHeader() || HasReadyToRunHeader()) ? IMAGE_FILE_MACHINE_NATIVE_NI : IMAGE_FILE_MACHINE_NATIVE; //do not call GetNTHeaders as we do not want to bother with PE32->PE32+ conversion -- cgit v1.2.3