[llvm-objdump] Don't disassemble symbols before SectionAddr
This was caught by UBSAN
tools/llvm-objdump/X86/macho-disassembly-g-dsym.test
tools/llvm-objdump/X86/hex-displacement.test
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358806 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp
index fb12e75..37b17cb 100644
--- a/tools/llvm-objdump/llvm-objdump.cpp
+++ b/tools/llvm-objdump/llvm-objdump.cpp
@@ -1148,13 +1148,15 @@
continue;
uint64_t Start = std::get<0>(Symbols[SI]);
+ if (Start < SectionAddr || StopAddress <= Start)
+ continue;
// The end is the section end, the beginning of the next symbol, or
// --stop-address.
- uint64_t End = std::min<uint64_t>(SectionAddr + SectSize, StopAddress);
- if (SI + 1 < SE)
- End = std::min(End, std::get<0>(Symbols[SI + 1]));
- if (Start >= End || Start >= StopAddress || End <= StartAddress)
+ uint64_t End = std::min<uint64_t>(
+ SI + 1 < SE ? std::get<0>(Symbols[SI + 1]) : SectionAddr + SectSize,
+ StopAddress);
+ if (Start >= End || End <= StartAddress)
continue;
Start -= SectionAddr;
End -= SectionAddr;