readelf: Check def == NULL before use in handle_versym.

Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --git a/src/ChangeLog b/src/ChangeLog
index 6d3e9514a2616841ec90aed3ed0f6a3d212cba58..be1d55fb91651bb5a5e3fb064796bc0c6a2fb423 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-14  Mark Wielaard  <mjw@redhat.com>
+
+       * readelf.c (handle_versym): Check def == NULL before use.
+
 2014-11-08  Mark Wielaard  <mjw@redhat.com>
 
        * readelf.c (handle_versym): Initialize vername and filename array

diff --git a/src/readelf.c b/src/readelf.c
index 01c644f2e69dd28146072920ffd00292e9ffc351..243e16e58ab98b4347cf1852fc781f4acaed7fc2 100644 (file)
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -2744,11 +2744,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
              /* Get the data at the next offset.  */
              GElf_Verdef defmem;
              GElf_Verdef *def = gelf_getverdef (defdata, offset, &defmem);
+             if (unlikely (def == NULL))
+               break;
+
              GElf_Verdaux auxmem;
              GElf_Verdaux *aux = gelf_getverdaux (defdata,
                                                   offset + def->vd_aux,
                                                   &auxmem);
-             if (unlikely (def == NULL || aux == NULL))
+             if (unlikely (aux == NULL))
                break;
 
              vername[def->vd_ndx & 0x7fff]