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 0c5ab37ee68f059a835f625c0916eba1b28907b8..66428b705978584d0a1c878b00876c2acae499d9 100644 (file)
--- 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 e721a2099e4a941cee340109d52989e196edfa82..3dafb04136b76a6532169e37602ef1c61c26c316 100644 (file)
--- 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) {