From f53c8cb4394e5a560a2a1bbfcd8da00af72a645e Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Mon, 8 Aug 2016 23:07:03 +0000 Subject: [PATCH] Revert "Do not ignore SizeOfOptionalHeader in COFF header even if PE header is not present." This reverts commit r278066 to unbreak buildbots. llvm-svn: 278070 --- llvm/lib/Object/COFFObjectFile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/llvm/lib/Object/COFFObjectFile.cpp b/llvm/lib/Object/COFFObjectFile.cpp index bbae185..668f4d0 100644 --- a/llvm/lib/Object/COFFObjectFile.cpp +++ b/llvm/lib/Object/COFFObjectFile.cpp @@ -716,10 +716,9 @@ COFFObjectFile::COFFObjectFile(MemoryBufferRef Object, std::error_code &EC) } if ((EC = getObject(DataDirectory, Data, DataDirAddr, DataDirSize))) return; + CurPtr += COFFHeader->SizeOfOptionalHeader; } - CurPtr += COFFHeader->SizeOfOptionalHeader; - if ((EC = getObject(SectionTable, Data, base() + CurPtr, (uint64_t)getNumberOfSections() * sizeof(coff_section)))) return; -- 2.7.4