summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2018-11-02 23:17:05 +0100
committerMark Wielaard <mark@klomp.org>2018-11-02 23:17:05 +0100
commite574889d92b123a2e62aa2f32bab00af86bfe5fd (patch)
tree6dddaf79dac59ba3c3da3ff19936c77dbdb5f906
parent5199e15870e05e5b0b9f98c20fc9b5427aa6dd6a (diff)
unstrip: Add ELF_CHECK to make sure gelf_getehdr () doesn't return NULL.
Signed-off-by: Mark Wielaard <mark@klomp.org>
-rw-r--r--src/ChangeLog5
-rw-r--r--src/unstrip.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 758534de..ca1533d3 100644
--- 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 32da89d7..3495b1d9 100644
--- 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