From adc90c9d6d1f6cf13a374399f3a3c574ddcbd8b5 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 14 Apr 2014 16:38:25 +0000 Subject: [PATCH] tools: fix heap-buffer-overrun detected via ASAN Once the auxiliary fields relating to the filename have been inspected, any following auxiliary fields need not be visited as they have been consumed (the following fields comprise the filepath as a single unit). Adjust the test to catch this even if ASAN is not enabled. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206190 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tools/llvm-objdump/coff-file.test | 1 + tools/llvm-objdump/llvm-objdump.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/test/tools/llvm-objdump/coff-file.test b/test/tools/llvm-objdump/coff-file.test index ba345b4d426..75d02b8a495 100644 --- a/test/tools/llvm-objdump/coff-file.test +++ b/test/tools/llvm-objdump/coff-file.test @@ -2,4 +2,5 @@ RUN: llvm-objdump -t %p/Inputs/file.obj.coff-arm | FileCheck %s CHECK: .file CHECK-NEXT: AUX /Users/compnerd/work/llvm/test/tools/llvm-readobj/Inputs/file.asm +CHECK-NEXT: [{{[ 0-9]+}}] diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index aff83f0cbd1..42c61c6386d 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -708,6 +708,9 @@ static void PrintCOFFSymbolTable(const COFFObjectFile *coff) { StringRef Name(AF->FileName, Symbol->NumberOfAuxSymbols * COFF::SymbolSize); outs() << "AUX " << Name.rtrim(StringRef("\0", 1)) << '\n'; + + SI = SI + Symbol->NumberOfAuxSymbols; + break; } else { outs() << "AUX Unknown\n"; } -- 2.34.1