readelf: Always initialize .debug_addr unit_length, even without a header.

We would print a "fake" .debug_addr header, but didn't always setup the
unit_length (in case there was a mix of GNU DebugFission and DWARF5 tables).
Make sure to always set the unit_length (we do always calculate the next
unit offset already).

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

diff --git a/src/ChangeLog b/src/ChangeLog
index c0ac418..cdc4720 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2018-06-05  Mark Wielaard  <mark@klomp.org>
 
+       * readelf.c (print_debug_addr_section): Set unit_length always to
+       (next_unitp - readp) in case we don't have a real header.
+
+2018-06-05  Mark Wielaard  <mark@klomp.org>
+
        * readelf.c (print_debug_loc_section): Set begin to idx when failing
        to read the start address if DW_LLE_GNU_start_end_entry.
 

diff --git a/src/readelf.c b/src/readelf.c
index 68a664d..eac5eac 100644 (file)
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -5178,10 +5178,7 @@ print_debug_addr_section (Dwfl_Module *dwflmod __attribute__ ((unused)),
              /* The addresses start here, but where do they end?  */
              listptr = get_listptr (&known_addrbases, idx);
              if (listptr == NULL)
-               {
-                 next_unitp = readendp;
-                 unit_length = (uint64_t) (next_unitp - readp);
-               }
+               next_unitp = readendp;
              else if (listptr->cu->version < 5)
                {
                  next_unitp = start + listptr->offset;
@@ -5192,7 +5189,6 @@ print_debug_addr_section (Dwfl_Module *dwflmod __attribute__ ((unused)),
                             PRIx64, off);
                      next_unitp = readendp;
                    }
-                 unit_length = (uint64_t) (next_unitp - readp);
                }
              else
                {
@@ -5215,6 +5211,7 @@ print_debug_addr_section (Dwfl_Module *dwflmod __attribute__ ((unused)),
                      next_unitp = readendp;
                    }
                }
+             unit_length = (uint64_t) (next_unitp - readp);
 
              /* Pretend we have a header.  */
              printf ("\n");