[llvm] r313970 - [obj2yaml] Don't crash for input files without symbol table

[Alexander Richardson via llvm-commits]

Author: arichardson
Date: Fri Sep 22 02:30:40 2017
New Revision: 313970

URL: http://llvm.org/viewvc/llvm-project?rev=313970&view=rev
Log:
[obj2yaml] Don't crash for input files without symbol table

Summary: Previously we would dereference Symtab without checking for null.

Reviewers: davide, atanasyan, rafael

Reviewed By: davide, atanasyan

Differential Revision: https://reviews.llvm.org/D38080

Added:
    llvm/trunk/test/tools/obj2yaml/Inputs/
    llvm/trunk/test/tools/obj2yaml/Inputs/crt1.o   (with props)
    llvm/trunk/test/tools/obj2yaml/missing_symtab.test
Modified:
    llvm/trunk/tools/obj2yaml/elf2yaml.cpp

Added: llvm/trunk/test/tools/obj2yaml/Inputs/crt1.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/obj2yaml/Inputs/crt1.o?rev=313970&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/obj2yaml/Inputs/crt1.o (added) and llvm/trunk/test/tools/obj2yaml/Inputs/crt1.o Fri Sep 22 02:30:40 2017 differ

Propchange: llvm/trunk/test/tools/obj2yaml/Inputs/crt1.o
------------------------------------------------------------------------------
    svn:executable = *

Added: llvm/trunk/test/tools/obj2yaml/missing_symtab.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/obj2yaml/missing_symtab.test?rev=313970&view=auto
==============================================================================
--- llvm/trunk/test/tools/obj2yaml/missing_symtab.test (added)
+++ llvm/trunk/test/tools/obj2yaml/missing_symtab.test Fri Sep 22 02:30:40 2017
@@ -0,0 +1,5 @@
+# RUN: obj2yaml %S/Inputs/crt1.o | FileCheck %s
+# test that we don't crash when passed object files without a symbol table
+# CHECK-LABEL: FileHeader:
+# CHECK-LABEL: Sections:
+# CHECK-LABEL: Symbols:

Modified: llvm/trunk/tools/obj2yaml/elf2yaml.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/elf2yaml.cpp?rev=313970&r1=313969&r2=313970&view=diff
==============================================================================
--- llvm/trunk/tools/obj2yaml/elf2yaml.cpp (original)
+++ llvm/trunk/tools/obj2yaml/elf2yaml.cpp Fri Sep 22 02:30:40 2017
@@ -188,6 +188,8 @@ template <class ELFT> ErrorOr<ELFYAML::O
   }
 
   // Dump symbols
+  if (!Symtab)
+    return Y.release(); // if the symbol table is missing return early
   auto StrTableOrErr = Obj.getStringTableForSymtab(*Symtab);
   if (!StrTableOrErr)
     return errorToErrorCode(StrTableOrErr.takeError());