From ce12ea8dfc371735672342f2dcc6ecfb32e3b4d7 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sat, 20 Apr 2019 07:19:24 +0000 Subject: [PATCH] [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 llvm-svn: 358806 --- llvm/tools/llvm-objdump/llvm-objdump.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index fb12e75..37b17cb 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -1148,13 +1148,15 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj, 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(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( + SI + 1 < SE ? std::get<0>(Symbols[SI + 1]) : SectionAddr + SectSize, + StopAddress); + if (Start >= End || End <= StartAddress) continue; Start -= SectionAddr; End -= SectionAddr; -- 2.7.4