diff options
author | Rui Ueyama <ruiu@google.com> | 2013-11-15 20:23:25 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2013-11-15 20:23:25 +0000 |
commit | 3a226015a0ca52936763a079da582656164c2908 (patch) | |
tree | 9f2d35d158610ea16bb6c8836bd1d74568eb5504 /lib/Object | |
parent | 7d5f2bd5f9615c0f20d3a1f75ec01452d813283b (diff) | |
download | external_llvm-3a226015a0ca52936763a079da582656164c2908.zip external_llvm-3a226015a0ca52936763a079da582656164c2908.tar.gz external_llvm-3a226015a0ca52936763a079da582656164c2908.tar.bz2 |
Readobj: If NumbersOfSections is 0xffff, it's an COFF import library.
0xffff does not mean that there are 65535 sections in a COFF file but
indicates that it's a COFF import library. This patch fixes SEGV error
when an import library file is passed to llvm-readobj.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194844 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Object')
-rw-r--r-- | lib/Object/COFFObjectFile.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp index f33caee..42066c3 100644 --- a/lib/Object/COFFObjectFile.cpp +++ b/lib/Object/COFFObjectFile.cpp @@ -507,9 +507,10 @@ COFFObjectFile::COFFObjectFile(MemoryBuffer *Object, error_code &ec) CurPtr += COFFHeader->SizeOfOptionalHeader; } - if ((ec = getObject(SectionTable, Data, base() + CurPtr, - COFFHeader->NumberOfSections * sizeof(coff_section)))) - return; + if (!COFFHeader->isImportLibrary()) + if ((ec = getObject(SectionTable, Data, base() + CurPtr, + COFFHeader->NumberOfSections * sizeof(coff_section)))) + return; // Initialize the pointer to the symbol table. if (COFFHeader->PointerToSymbolTable != 0) @@ -586,7 +587,9 @@ section_iterator COFFObjectFile::begin_sections() const { section_iterator COFFObjectFile::end_sections() const { DataRefImpl ret; - ret.p = reinterpret_cast<uintptr_t>(SectionTable + COFFHeader->NumberOfSections); + int numSections = COFFHeader->isImportLibrary() + ? 0 : COFFHeader->NumberOfSections; + ret.p = reinterpret_cast<uintptr_t>(SectionTable + numSections); return section_iterator(SectionRef(ret, this)); } |