[PATCH] D41215: Fix crash on invalid

[Rafael Ávila de Espíndola via Phabricator via llvm-commits]

rafael created this revision.
rafael added a reviewer: ruiu.
Herald added a subscriber: emaste.

https://reviews.llvm.org/D41215

Files:
  ELF/SymbolTable.cpp
  test/ELF/Inputs/local-symbol-in-dso.so
  test/ELF/invalid-local-symbol-in-dso.s


Index: test/ELF/invalid-local-symbol-in-dso.s
===================================================================
--- /dev/null
+++ test/ELF/invalid-local-symbol-in-dso.s
@@ -0,0 +1,5 @@
+# RUN: llvm-mc %s -o %t.o -filetype=obj -triple x86_64-pc-linux
+
+# We used to crash on this
+# RUN: not ld.lld %t.o %p/Inputs/local-symbol-in-dso.so -o %t 2>&1 | FileCheck %s
+# CHECK: Found local symbol 'foo' in global part of symbol table in file {{.*}}local-symbol-in-dso.so
Index: ELF/SymbolTable.cpp
===================================================================
--- ELF/SymbolTable.cpp
+++ ELF/SymbolTable.cpp
@@ -495,7 +495,11 @@
   if (WasInserted || ((S->isUndefined() || S->isLazy()) &&
                       S->getVisibility() == STV_DEFAULT)) {
     uint8_t Binding = S->Binding;
-    replaceSymbol<SharedSymbol>(S, File, Name, Sym.getBinding(), Sym.st_other,
+    uint8_t OrigBinding = Sym.getBinding();
+    if (OrigBinding == STB_LOCAL)
+      error("Found local symbol '" + Name +
+            "' in global part of symbol table in file " + toString(File));
+    replaceSymbol<SharedSymbol>(S, File, Name, OrigBinding, Sym.st_other,
                                 Sym.getType(), Sym.st_value, Sym.st_size,
                                 Alignment, VerdefIndex);
     if (!WasInserted) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D41215.126879.patch
Type: text/x-patch
Size: 1302 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171214/5b49afa9/attachment.bin>