unstrip: Add ELF_CHECK to make sure gelf_getehdr () doesn't return NULL.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 758534de162513cbcde439f29bab8252fffa79e0..ca1533d36d652a137968ae0130ab6e4b50c8020e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-02  Mark Wielaard  <mark@klomp.org>
+
+       * unstrip.c (copy_elf): Add ELF_CHECK to make sure gelf_getehdr ()
+       doesn't return NULL.
+
 2018-10-18  Mark Wielaard  <mark@klomp.org>
 
        * elflint.c (check_note_data): Recognize NT_GNU_PROPERTY_TYPE_0.

diff --git a/src/unstrip.c b/src/unstrip.c
index 32da89d7ad45a52c6f0034c5002afaf32f07c848..3495b1d916eb5edee95811a240413f89afbe2817 100644 (file)
--- a/src/unstrip.c
+++ b/src/unstrip.c
@@ -245,6 +245,7 @@ copy_elf (Elf *outelf, Elf *inelf)
 
   GElf_Ehdr ehdr_mem;
   GElf_Ehdr *ehdr = gelf_getehdr (inelf, &ehdr_mem);
+  ELF_CHECK (ehdr != NULL, _("cannot get ELF header: %s"));
   if (shstrndx < SHN_LORESERVE)
     ehdr->e_shstrndx = shstrndx;
   else