From: Mark Wielaard <mark@klomp.org>
Date: Thu, 3 Nov 2022 12:52:32 +0000 (+0100)
Subject: readelf: Check gelf_getdyn doesn't return NULL
X-Git-Tag: elfutils-0.189~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52a6a3110e019d696284fdd822c2a2f0987dded2;p=thirdparty%2Felfutils.git

readelf: Check gelf_getdyn doesn't return NULL

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c5ab37ee..66428b705 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2022-11-03  Mark Wielaard  <mark@klomp.org>
+
+	* readelf.c (get_dynscn_addrs): Check gelf_getdyn doesn't
+	return NULL.
+
 2022-11-03  Mark Wielaard  <mark@klomp.org>
 
 	* readelf.c (handle_dynamic): Check phdr != NULL when
diff --git a/src/readelf.c b/src/readelf.c
index e721a2099..3dafb0413 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -4910,7 +4910,7 @@ get_dynscn_addrs(Elf *elf, GElf_Phdr *phdr, GElf_Addr addrs[i_max])
     GElf_Dyn dyn_mem;
     GElf_Dyn *dyn = gelf_getdyn(data, dyn_idx, &dyn_mem);
     /* DT_NULL Marks end of dynamic section.  */
-    if (dyn->d_tag == DT_NULL)
+    if (dyn == NULL || dyn->d_tag == DT_NULL)
       break;
 
     switch (dyn->d_tag) {