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 | ce8f24e6d75e12371b723070fbcd546ebb01598b (patch) | |
tree | 712015bbacb3f4544b3c404a5bedef5e720410a9 /tools/llvm-objdump/llvm-objdump.cpp | |
parent | 9cf32a0f1d22c5ece8a581e98166ddac8a6e61a7 (diff) |
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
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@317373 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-objdump/llvm-objdump.cpp')
-rw-r--r-- | tools/llvm-objdump/llvm-objdump.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index d80f1cb049d..02eaa89f088 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/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; |