diff options
author | Kevin Enderby <enderby@apple.com> | 2017-11-03 21:32:44 +0000 |
---|---|---|
committer | Kevin Enderby <enderby@apple.com> | 2017-11-03 21:32:44 +0000 |
commit | 3fc9188fa8cb939539e568a0ef602892aa3fc59a (patch) | |
tree | e378981a910273538fa31e4074db6585411b6ab7 /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
parent | 3cee7cfb30f5b3a85fc2953eaabb5fba6268b5b3 (diff) | |
download | bcm5719-llvm-3fc9188fa8cb939539e568a0ef602892aa3fc59a.tar.gz bcm5719-llvm-3fc9188fa8cb939539e568a0ef602892aa3fc59a.zip |
Fix a crash in llvm-objdump when printing a bad x86_64 relocation in a Mach-O
file with a bad section number.
rdar://35207539
llvm-svn: 317373
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
-rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index d80f1cb049d..02eaa89f088 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -865,8 +865,19 @@ static void printRelocationTargetName(const MachOObjectFile *O, } else { section_iterator SI = O->section_begin(); // Adjust for the fact that sections are 1-indexed. - advance(SI, Val - 1); - SI->getName(S); + if (Val == 0) { + fmt << "0 (?,?)"; + return; + } + uint32_t i = Val - 1; + while (i != 0 && SI != O->section_end()) { + i--; + advance(SI, 1); + } + if (SI == O->section_end()) + fmt << Val << " (?,?)"; + else + SI->getName(S); } fmt << S; |