aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Object/MachOObjectFile.cpp
diff options
context:
space:
mode:
authorFilipe Cabecinhas <me@filcab.net>2015-01-15 23:50:44 +0000
committerFilipe Cabecinhas <me@filcab.net>2015-01-15 23:50:44 +0000
commitc552c9abcef103e45a7e604116d3046ecb240925 (patch)
tree91dd28e2288d3e98f94200a373857b091d5dbf7d /llvm/lib/Object/MachOObjectFile.cpp
parent13023a1af6965374b0c253e8092cc36fbb46dcab (diff)
downloadllvm-c552c9abcef103e45a7e604116d3046ecb240925.zip
llvm-c552c9abcef103e45a7e604116d3046ecb240925.tar.gz
llvm-c552c9abcef103e45a7e604116d3046ecb240925.tar.bz2
Fix edge case when Start overflowed in 32 bit mode
llvm-svn: 226229
Diffstat (limited to 'llvm/lib/Object/MachOObjectFile.cpp')
-rw-r--r--llvm/lib/Object/MachOObjectFile.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index a367a49..4f54407 100644
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/llvm/lib/Object/MachOObjectFile.cpp
@@ -336,8 +336,9 @@ std::error_code MachOObjectFile::getSymbolName(DataRefImpl Symb,
StringRef StringTable = getStringTableData();
MachO::nlist_base Entry = getSymbolTableEntryBase(this, Symb);
const char *Start = &StringTable.data()[Entry.n_strx];
- if (Start >= getData().end())
- report_fatal_error("Symbol name entry points past end of file.");
+ if (Start < getData().begin() || Start >= getData().end())
+ report_fatal_error(
+ "Symbol name entry points before beginning or past end of file.");
Res = StringRef(Start);
return object_error::success;
}