From: Mark Wielaard <mark@klomp.org>
Date: Thu, 6 Apr 2023 14:58:13 +0000 (+0200)
Subject: readelf: Handle NULL shdr in section_name
X-Git-Tag: elfutils-0.190~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8d1900ace46542e0fd4e0cec8af2324166109e4;p=thirdparty%2Felfutils.git

readelf: Handle NULL shdr in section_name

In some error cases we want to show the section name but cannot
because the section header is corrupt or NULL. Make sure the
section_name always returns "???" in that case.

	* src/readelf.c (section_name): Check for shdr == NULL.

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

diff --git a/src/readelf.c b/src/readelf.c
index 6950204ef..4a1b985dc 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -1606,7 +1606,7 @@ static const char *
 section_name (Ebl *ebl, GElf_Shdr *shdr)
 {
   size_t shstrndx;
-  if (elf_getshdrstrndx (ebl->elf, &shstrndx) < 0)
+  if (shdr == NULL || elf_getshdrstrndx (ebl->elf, &shstrndx) < 0)
     return "???";
   return elf_strptr (ebl->elf, shstrndx, shdr->sh_name) ?: "???";
 }