public inbox for
help / color / mirror / Atom feed
From: Tom Tromey <>
Subject: [binutils-gdb] Fix end of CU calculation in cooked_indexer::index_dies
Date: Sat, 25 Jun 2022 17:10:30 +0000 (GMT)	[thread overview]
Message-ID: <> (raw);h=a858187afda380dd0bd9479f58c152178e275903

commit a858187afda380dd0bd9479f58c152178e275903
Author: Tom Tromey <>
Date:   Thu Jun 9 07:21:24 2022 -0600

    Fix end of CU calculation in cooked_indexer::index_dies
    cooked_indexer::index_dies incorrect computes the end of the current
    CU in the .debug_info.  This isn't readily testable without writing
    intentionally corrupt DWARF, but it's apparent through observation: it
    is currently based on 'info_ptr', which does not always point to the
    start of the CU.  This patch fixes the expression.  Tested on x86-64
    Fedora 34.

 gdb/dwarf2/read.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index e22e09b4e2b..80bb2929435 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -18283,7 +18283,9 @@ cooked_indexer::index_dies (cutu_reader *reader,
 			    const cooked_index_entry *parent_entry,
 			    bool fully)
-  const gdb_byte *end_ptr = info_ptr + reader->cu->header.get_length ();
+  const gdb_byte *end_ptr = (reader->buffer
+			     + to_underlying (reader->cu->header.sect_off)
+			     + reader->cu->header.get_length ());
   while (info_ptr < end_ptr)

                 reply	other threads:[~2022-06-25 17:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* 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).