[binutils-gdb] Fix end of CU calculation in cooked_indexer::index_dies

[binutils-gdb] Fix end of CU calculation in cooked_indexer::index_dies

[Tom Tromey]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a858187afda380dd0bd9479f58c152178e275903

commit a858187afda380dd0bd9479f58c152178e275903
Author: Tom Tromey <tom@tromey.com>
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.

Diff:
---
 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)
     {