[PATCH] D44285: Fix computeSymbolSizes SEGFAULT on invalid file

Teng Qin via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Mar 29 14:43:12 PDT 2018


palmtenor updated this revision to Diff 140340.
palmtenor added a comment.

@aprantl Sure! Just updated the test:)


https://reviews.llvm.org/D44285

Files:
  lib/Object/SymbolSize.cpp
  test/tools/llvm-symbolizer/Inputs/zero
  test/tools/llvm-symbolizer/sym.test


Index: test/tools/llvm-symbolizer/sym.test
===================================================================
--- test/tools/llvm-symbolizer/sym.test
+++ test/tools/llvm-symbolizer/sym.test
@@ -19,6 +19,8 @@
 
 RUN: llvm-symbolizer -print-address -obj=%p/Inputs/addr.exe < %p/Inputs/addr.inp | FileCheck %s
 RUN: llvm-symbolizer -inlining -print-address -pretty-print -obj=%p/Inputs/addr.exe < %p/Inputs/addr.inp | FileCheck --check-prefix="PRETTY" %s 
+RUN: echo "0x1" > %t.input
+RUN: llvm-symbolizer -obj=%p/Inputs/zero < %t.input | FileCheck --check-prefix="ZERO" %s
 
 #CHECK: some text
 #CHECK: 0x40054d
@@ -31,4 +33,6 @@
 #PRETTY:  (inlined by) inc at {{[/\]+}}tmp{{[/\]+}}x.c:7:0
 #PRETTY   (inlined by) main at {{[/\]+}}tmp{{[/\]+}}x.c:14:0
 #PRETTY: some text2
-
+#
+#ZERO: ??
+#ZERO: ??:0:0
Index: lib/Object/SymbolSize.cpp
===================================================================
--- lib/Object/SymbolSize.cpp
+++ lib/Object/SymbolSize.cpp
@@ -66,6 +66,10 @@
     Addresses.push_back(
         {O.symbol_end(), Address + Size, 0, getSectionID(O, Sec)});
   }
+
+  if (Addresses.empty())
+    return Ret;
+
   array_pod_sort(Addresses.begin(), Addresses.end(), compareAddress);
 
   // Compute the size as the gap to the next symbol


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D44285.140340.patch
Type: text/x-patch
Size: 1256 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180329/f8be1535/attachment.bin>


More information about the llvm-commits mailing list