From: Mark Wielaard <mark@klomp.org>
To: elfutils-devel@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [PATCH] readelf: Always initialize .debug_addr unit_length, even without a header.
Date: Tue, 05 Jun 2018 21:23:00 -0000 [thread overview]
Message-ID: <1528233823-449-1-git-send-email-mark@klomp.org> (raw)
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>
---
src/ChangeLog | 5 +++++
src/readelf.c | 7 ++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index ec07bb1..b213c91 100644
--- 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 eaeb70c..d2c65fd 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -5149,10 +5149,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;
@@ -5163,7 +5160,6 @@ print_debug_addr_section (Dwfl_Module *dwflmod __attribute__ ((unused)),
PRIx64, off);
next_unitp = readendp;
}
- unit_length = (uint64_t) (next_unitp - readp);
}
else
{
@@ -5186,6 +5182,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");
--
1.8.3.1
next reply other threads:[~2018-06-05 21:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 21:23 Mark Wielaard [this message]
2018-06-08 10:09 ` Mark Wielaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1528233823-449-1-git-send-email-mark@klomp.org \
--to=mark@klomp.org \
--cc=elfutils-devel@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).