commit 00ddb1416d99edf2718c0b8c942a8fe41ef42e16
author Rafael Espindola <rafael.espindola@gmail.com> Mon Jul 20 03:38:17 2015 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Mon Jul 20 03:38:17 2015 +0000
tree 35d81bbc95c4c19a5d73215a9960b2fe4d36479e
parent c46ffb7a49d18e4a6bf75eb7efcba3cca53221e8

llvm-readobj: Handle invalid references to the string table.

llvm-svn: 242658

llvm/tools/llvm-readobj/ELFDumper.cpp

diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 3deeb8d..045f4df 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -954,6 +954,14 @@
 }
 
 template <class ELFT>
+static const char *getDynamicString(const ELFFile<ELFT> &O, uint64_t Value) {
+  const char *Ret = O.getDynamicString(Value);
+  if (!Ret)
+    reportError("Invalid dynamic string table reference");
+  return Ret;
+}
+
+template <class ELFT>
 static void printValue(const ELFFile<ELFT> *O, uint64_t Type, uint64_t Value,
                        bool Is64, raw_ostream &OS) {
   switch (Type) {
@@ -1011,14 +1019,14 @@
     OS << Value << " (bytes)";
     break;
   case DT_NEEDED:
-    OS << "SharedLibrary (" << O->getDynamicString(Value) << ")";
+    OS << "SharedLibrary (" << getDynamicString(*O, Value) << ")";
     break;
   case DT_SONAME:
-    OS << "LibrarySoname (" << O->getDynamicString(Value) << ")";
+    OS << "LibrarySoname (" << getDynamicString(*O, Value) << ")";
     break;
   case DT_RPATH:
   case DT_RUNPATH:
-    OS << O->getDynamicString(Value);
+    OS << getDynamicString(*O, Value);
     break;
   case DT_MIPS_FLAGS:
     printFlags(Value, makeArrayRef(ElfDynamicDTMipsFlags), OS);
@@ -1088,7 +1096,7 @@
 
   for (const auto &Entry : Obj->dynamic_table())
     if (Entry.d_tag == ELF::DT_NEEDED)
-      Libs.push_back(Obj->getDynamicString(Entry.d_un.d_val));
+      Libs.push_back(getDynamicString(*Obj, Entry.d_un.d_val));
 
   std::stable_sort(Libs.begin(), Libs.end());
 

llvm/tools/llvm-readobj/llvm-readobj.cpp

diff --git a/llvm/tools/llvm-readobj/llvm-readobj.cpp b/llvm/tools/llvm-readobj/llvm-readobj.cpp
index b525ce1..3f03618 100644
--- a/llvm/tools/llvm-readobj/llvm-readobj.cpp
+++ b/llvm/tools/llvm-readobj/llvm-readobj.cpp
@@ -188,14 +188,14 @@
 
 } // namespace opts
 
-static void reportError(Twine Msg) {
+namespace llvm {
+
+void reportError(Twine Msg) {
   outs() << Msg << "\n";
   outs().flush();
   exit(1);
 }
 
-namespace llvm {
-
 void error(std::error_code EC) {
   if (!EC)
     return;

llvm/tools/llvm-readobj/llvm-readobj.h

diff --git a/llvm/tools/llvm-readobj/llvm-readobj.h b/llvm/tools/llvm-readobj/llvm-readobj.h
index 8872fc2..58c50f5 100644
--- a/llvm/tools/llvm-readobj/llvm-readobj.h
+++ b/llvm/tools/llvm-readobj/llvm-readobj.h
@@ -19,6 +19,7 @@
   }
 
   // Various helper functions.
+  void reportError(Twine Msg);
   void error(std::error_code ec);
   bool relocAddressLess(object::RelocationRef A,
                         object::RelocationRef B);