From: Mark Wielaard <mark@klomp.org>
Date: Wed, 24 Oct 2018 14:15:04 +0000 (+0200)
Subject: addr2line: Use elf_getshdrstrndx not Ehdr field to print section name.
X-Git-Tag: elfutils-0.175~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b75ff1bbd060404565fa28d72441a9b02f331bae;p=thirdparty%2Felfutils.git

addr2line: Use elf_getshdrstrndx not Ehdr field to print section name.

Using the Ehdr field directly doesn't work when there are a large number
of sections.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/src/ChangeLog b/src/ChangeLog
index bd6751ad0..5061cc11b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-24  Mark Wielaard  <mark@klomp.org>
+
+	* addr2line.c (print_addrsym): Use elf_getshdrstrndx instead of
+	Ehdr field.
+
 2018-10-24  Mark Wielaard  <mark@klomp.org>
 
 	* readelf.c (section_name): Remove ehdr argument, lookup shstrndx.
diff --git a/src/addr2line.c b/src/addr2line.c
index b7eb893ed..69d8d9958 100644
--- a/src/addr2line.c
+++ b/src/addr2line.c
@@ -446,9 +446,9 @@ print_addrsym (Dwfl_Module *mod, GElf_Addr addr)
 	      if (shdr != NULL)
 		{
 		  Elf *elf = dwfl_module_getelf (mod, &ebias);
-		  GElf_Ehdr ehdr;
-		  if (gelf_getehdr (elf, &ehdr) != NULL)
-		    printf (" (%s)", elf_strptr (elf, ehdr.e_shstrndx,
+		  size_t shstrndx;
+		  if (elf_getshdrstrndx (elf, &shstrndx) >= 0)
+		    printf (" (%s)", elf_strptr (elf, shstrndx,
 						 shdr->sh_name));
 		}
 	    }