summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-readobj
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2014-04-14 02:37:23 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2014-04-14 02:37:23 +0000
commitd38c6b1e4bdec798517aee0d3ad7ff461a5b54b7 (patch)
treef1929bb06fa272333688e0582ab6d4858ca86b51 /llvm/tools/llvm-readobj
parentb5f3ddc7a1dbbbe8e9d26a28bac6682e11fdc9b5 (diff)
downloadbcm5719-llvm-d38c6b1e4bdec798517aee0d3ad7ff461a5b54b7.tar.gz
bcm5719-llvm-d38c6b1e4bdec798517aee0d3ad7ff461a5b54b7.zip
tools: address possible non-null terminated filenames
If a filename is a multiple of 18 characters, there will be no null-terminator. This will result in an invalid access by the constructed StringRef. Add a test case to exercise this and fix that handling. Address this same vulnerability in llvm-readobj as well. llvm-svn: 206145
Diffstat (limited to 'llvm/tools/llvm-readobj')
-rw-r--r--llvm/tools/llvm-readobj/COFFDumper.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/tools/llvm-readobj/COFFDumper.cpp b/llvm/tools/llvm-readobj/COFFDumper.cpp
index 69be82ec3e7..8d08d021a38 100644
--- a/llvm/tools/llvm-readobj/COFFDumper.cpp
+++ b/llvm/tools/llvm-readobj/COFFDumper.cpp
@@ -977,7 +977,10 @@ void COFFDumper::printSymbol(const SymbolRef &Sym) {
break;
DictScope AS(W, "AuxFileRecord");
- W.printString("FileName", StringRef(Aux->FileName));
+
+ StringRef Name(Aux->FileName,
+ Symbol->NumberOfAuxSymbols * COFF::SymbolSize);
+ W.printString("FileName", Name.rtrim(StringRef("\0", 1)));
} else if (Symbol->isSectionDefinition()) {
const coff_aux_section_definition *Aux;
if (error(getSymbolAuxData(Obj, Symbol + I, Aux)))
OpenPOWER on IntegriCloud