From e1ed146af8f3c57093a8ac652cdb80379b7a8ed1 Mon Sep 17 00:00:00 2001 From: Dani Pozo Date: Sun, 17 Nov 2024 19:36:58 +0100 Subject: [PATCH] debug/dwarf: Fail on reading incorrect offset due to skipped compilation unit --- src/debug/dwarf/entry.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/debug/dwarf/entry.go b/src/debug/dwarf/entry.go index 4541d74d4db..23c5ca41a33 100644 --- a/src/debug/dwarf/entry.go +++ b/src/debug/dwarf/entry.go @@ -541,6 +541,8 @@ func (b *buf) entry(cu *Entry, atab abbrevTable, ubase Offset, vers int) *Entry } else if a.tag == TagCompileUnit { delay = append(delay, delayed{i, off, formAddrx}) break + } else { + b.error("Can't adjust offset: compilation unit skipped") } var err error @@ -692,6 +694,8 @@ func (b *buf) entry(cu *Entry, atab abbrevTable, ubase Offset, vers int) *Entry } else if a.tag == TagCompileUnit { delay = append(delay, delayed{i, off, formStrx}) break + } else { + b.error("Can't adjust offset: compilation unit skipped") } val = resolveStrx(uint64(strBase), off) @@ -752,6 +756,8 @@ func (b *buf) entry(cu *Entry, atab abbrevTable, ubase Offset, vers int) *Entry } else if a.tag == TagCompileUnit { delay = append(delay, delayed{i, off, formRnglistx}) break + } else { + b.error("Can't adjust offset: compilation unit skipped") } val = resolveRnglistx(uint64(rnglistsBase), off) @@ -856,6 +862,15 @@ func (r *Reader) Seek(off Offset) { r.b = makeBuf(r.d, u, "info", off, u.data[off-u.off:]) } +// SeekAndSetCU positions the [Reader] at offset off in the encoded entry stream, and additionally sets the current +// CU for the reader. +func (r *Reader) SeekAndSetCU(off Offset) { + cuIdx := r.d.offsetToUnit(off) + r.Seek(r.d.unit[cuIdx].off) + r.Next() + r.Seek(off) +} + // maybeNextUnit advances to the next unit if this one is finished. func (r *Reader) maybeNextUnit() { for len(r.b.data) == 0 && r.unit+1 < len(r.d.unit) {