From a858187afda380dd0bd9479f58c152178e275903 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Thu, 9 Jun 2022 07:21:24 -0600
Subject: [PATCH] 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)
{