From: Rui Ueyama <ruiu@google.com>
Date: Thu, 11 Aug 2016 22:02:44 +0000 (+0000)
Subject: Re-commit r278066: Do not ignore SizeOfOptionalHeader in COFF header even if PE heade... 
X-Git-Tag: llvmorg-4.0.0-rc1~12675
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8950a53821d1b76ced7cb8cc0baf6e6292c77406;p=platform%2Fupstream%2Fllvm.git

Re-commit r278066: Do not ignore SizeOfOptionalHeader in COFF header even if PE header is not present.

llvm-svn: 278429
---

diff --git a/llvm/lib/Object/COFFObjectFile.cpp b/llvm/lib/Object/COFFObjectFile.cpp
index a43eca6..a9a8107 100644
--- a/llvm/lib/Object/COFFObjectFile.cpp
+++ b/llvm/lib/Object/COFFObjectFile.cpp
@@ -718,9 +718,11 @@ COFFObjectFile::COFFObjectFile(MemoryBufferRef Object, std::error_code &EC)
     }
     if ((EC = getObject(DataDirectory, Data, DataDirAddr, DataDirSize)))
       return;
-    CurPtr += COFFHeader->SizeOfOptionalHeader;
   }
 
+  if (COFFHeader)
+    CurPtr += COFFHeader->SizeOfOptionalHeader;
+
   if ((EC = getObject(SectionTable, Data, base() + CurPtr,
                       (uint64_t)getNumberOfSections() * sizeof(coff_section))))
     return;