RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-04-02 08:11:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Detect invalid section indexes when we first read them.

Browse Source 
We still detect the same errors, but now we do it earlier.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238024 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2015-05-22 14:59:27 +00:00
parent 8a95a5095d
commit cc3f1db34c
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Object/MachOObjectFile.cpp
View File

@ -537,6 +537,8 @@ std::error_code MachOObjectFile::getSymbolSection(DataRefImpl Symb,
} else {
DataRefImpl DRI;
DRI.d.a = index - 1;
if (DRI.d.a >= Sections.size())
report_fatal_error("getSymbolSection: Invalid section index.");
Res = section_iterator(SectionRef(DRI, this));
}
@ -2146,8 +2148,7 @@ MachOObjectFile::getSectionFinalSegmentName(DataRefImpl Sec) const {
ArrayRef<char>
MachOObjectFile::getSectionRawName(DataRefImpl Sec) const {
if (Sec.d.a >= Sections.size())
report_fatal_error("getSectionRawName: Invalid section index");
assert(Sec.d.a < Sections.size() && "Should have detected this earlier");
const section_base *Base =
reinterpret_cast<const section_base *>(Sections[Sec.d.a]);
return makeArrayRef(Base->sectname);
@ -2155,8 +2156,7 @@ MachOObjectFile::getSectionRawName(DataRefImpl Sec) const {
ArrayRef<char>
MachOObjectFile::getSectionRawFinalSegmentName(DataRefImpl Sec) const {
if (Sec.d.a >= Sections.size())
report_fatal_error("getSectionRawFinalSegmentName: Invalid section index");
assert(Sec.d.a < Sections.size() && "Should have detected this earlier");
const section_base *Base =
reinterpret_cast<const section_base *>(Sections[Sec.d.a]);
return makeArrayRef(Base->segname);

BIN
test/Object/Inputs/macho-invalid-section-index-getSectionRawFinalSegmentName
View File

Binary file not shown.

8
test/Object/macho-invalid.test
View File

@ -25,11 +25,8 @@ RUN: | FileCheck -check-prefix BAD-SYMBOL %s
RUN: not llvm-objdump -t %p/Inputs/macho-invalid-symbol-name-past-eof 2>&1 \
RUN: | FileCheck -check-prefix NAME-PAST-EOF %s
RUN: not llvm-objdump -t %p/Inputs/macho-invalid-section-index-getSectionRawFinalSegmentName 2>&1 \
RUN: | FileCheck -check-prefix INVALID-SECTION-IDX-SEG-NAME %s
RUN: not llvm-nm %p/Inputs/macho-invalid-section-index-getSectionRawName 2>&1 \
RUN: | FileCheck -check-prefix INVALID-SECTION-IDX-SECT-NAME %s
RUN: | FileCheck -check-prefix INVALID-SECTION-IDX-SYMBOL-SEC %s
RUN: not llvm-objdump -t %p/Inputs/macho-invalid-getsection-index 2>&1 \
RUN: | FileCheck -check-prefix INVALID-SECTION-IDX-GETSECT %s
@ -45,7 +42,6 @@ TOO-MANY-SECTS: Number of sections too large for size of load command
BAD-SYMBOL: Requested symbol index is out of range
NAME-PAST-EOF: Symbol name entry points before beginning or past end of file
INVALID-SECTION-IDX-SEG-NAME: getSectionRawFinalSegmentName: Invalid section index
INVALID-SECTION-IDX-SECT-NAME: getSectionRawName: Invalid section index
INVALID-SECTION-IDX-SYMBOL-SEC: getSymbolSection: Invalid section index
INVALID-SECTION-IDX-GETSECT: getSection: Invalid section index
INVALID-SECTION-IDX-GETSECT64: getSection64: Invalid section index