From: Mark Wielaard <mark@klomp.org>
Date: Tue, 5 Jun 2018 21:21:05 +0000 (+0200)
Subject: readelf: Always initialize .debug_addr unit_length, even without a header.
X-Git-Tag: elfutils-0.172~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3b15251cdb68e225dc4e0433984784b7a6592d5;p=thirdparty%2Felfutils.git

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 c0ac41819..cdc472051 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/src/readelf.c b/src/readelf.c
index 68a664d58..eac5eac4e 100644
--- 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");