Skip to content

Commit

Permalink
debug/dwarf: Fail on reading incorrect offset due to skipped compilat…
Browse files Browse the repository at this point in the history
…ion unit
  • Loading branch information
danipozo committed Nov 17, 2024
1 parent 44d4b69 commit 9c58cf3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
15 changes: 15 additions & 0 deletions src/debug/dwarf/entry.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module std

go 1.24
go 1.22

require (
golang.org/x/crypto v0.25.1-0.20240722173533-bb80217080b0
Expand Down

0 comments on commit 9c58cf3

Please sign in to comment.