maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Don't read one command past the end. 

Thanks to Evgeniy Stepanov for reporting this.

It might be a good idea to add a command iterator abstraction to MachO.h, but
this fixes the bug for now.

llvm-svn: 179848
This commit is contained in:
Rafael Espindola 2013-04-19 11:36:47 +00:00
parent a155ab2dd2
commit feef8c2469
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/Object/MachOObjectFile.cpp
View File

@ -405,7 +405,7 @@ MachOObjectFile::MachOObjectFile(MemoryBuffer *Object,
macho::LCT_Segment64 : macho::LCT_Segment; macho::LCT_Segment64 : macho::LCT_Segment;
MachOObjectFile::LoadCommandInfo Load = getFirstLoadCommandInfo(); MachOObjectFile::LoadCommandInfo Load = getFirstLoadCommandInfo();
for (unsigned I = 0; I < LoadCommandCount; ++I) { for (unsigned I = 0; ; ++I) {
if (Load.C.Type == macho::LCT_Symtab) { if (Load.C.Type == macho::LCT_Symtab) {
assert(!SymtabLoadCmd && "Multiple symbol tables"); assert(!SymtabLoadCmd && "Multiple symbol tables");
SymtabLoadCmd = Load.Ptr; SymtabLoadCmd = Load.Ptr;
@ -418,7 +418,11 @@ MachOObjectFile::MachOObjectFile(MemoryBuffer *Object,
Sections.push_back(reinterpret_cast<const char*>(Sec)); Sections.push_back(reinterpret_cast<const char*>(Sec));
} }
} }
Load = getNextLoadCommandInfo(Load);
if (I == LoadCommandCount - 1)
break;
else
Load = getNextLoadCommandInfo(Load);
} }
} }

4
llvm/test/Object/ARM/objdump-thumb.test Normal file
View File

@ -0,0 +1,4 @@
RUN: llvm-objdump -d -macho -triple=thumbv7-apple-ios \
RUN: %p/../Inputs/macho-text.thumb | FileCheck %s
CHECK: 0: 00 bf nop

BIN
llvm/test/Object/Inputs/macho-text.thumb Normal file
View File

Binary file not shown.

8
llvm/tools/llvm-objdump/MachODump.cpp
View File

@ -205,7 +205,7 @@ getSectionsAndSymbols(const macho::Header Header,
MachOObjectFile::LoadCommandInfo Command = MachOObjectFile::LoadCommandInfo Command =
MachOObj->getFirstLoadCommandInfo(); MachOObj->getFirstLoadCommandInfo();
for (unsigned i = 0; i != Header.NumLoadCommands; ++i) { for (unsigned i = 0; ; ++i) {
if (Command.C.Type == macho::LCT_FunctionStarts) { if (Command.C.Type == macho::LCT_FunctionStarts) {
// We found a function starts segment, parse the addresses for later // We found a function starts segment, parse the addresses for later
// consumption. // consumption.
@ -214,7 +214,11 @@ getSectionsAndSymbols(const macho::Header Header,
MachOObj->ReadULEB128s(LLC.DataOffset, FoundFns); MachOObj->ReadULEB128s(LLC.DataOffset, FoundFns);
} }
Command = MachOObj->getNextLoadCommandInfo(Command);
if (i == Header.NumLoadCommands - 1)
break;
else
Command = MachOObj->getNextLoadCommandInfo(Command);
} }
} }