PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkg/proc: defend better against missing DWARF (#3695)

Browse Source 
The `scope.Locals` function did not have any guard checks against missing DWARF information.
This patch adds a check, which likely will need to be added to other functions as well.
This commit is contained in:
Derek Parker 2024-04-05 02:46:39 -07:00 committed by GitHub
parent bae4dfbc4c
commit 6f1f549c71
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/dwarf/godwarf/tree.go
View File

@ -2,6 +2,7 @@ package godwarf
import (
"debug/dwarf"
"errors"
"fmt"
"sort"
)
@ -90,6 +91,9 @@ type Tree struct {
// range of addresses that is not covered by its parent LoadTree will fix
// the parent entry.
func LoadTree(off dwarf.Offset, dw *dwarf.Data, staticBase uint64) (*Tree, error) {
if dw == nil {
return nil, errors.New("unable to load DWARF tree: no DWARF information present")
}
rdr := dw.Reader()
rdr.Seek(off)

4
pkg/proc/eval.go
View File

@ -371,6 +371,10 @@ func (scope *EvalScope) Locals(flags localsFlags) ([]*Variable, error) {
return nil, errors.New("unable to find function context")
}
if scope.image().Stripped() {
return nil, errors.New("unable to find locals: no debug information present in binary")
}
trustArgOrder := (flags&localsTrustArgOrder != 0) && scope.BinInfo.Producer() != "" && goversion.ProducerAfterOrEqual(scope.BinInfo.Producer(), 1, 12) && scope.Fn != nil && (scope.PC == scope.Fn.Entry)
dwarfTree, err := scope.image().getDwarfTree(scope.Fn.offset)

10
pkg/proc/proc_test.go
View File

@ -3216,11 +3216,19 @@ func TestDebugStripped(t *testing.T) {
assertLineNumber(p, t, 37, "first continue")
assertNoError(grp.Next(), t, "Next")
assertLineNumber(p, t, 38, "after next")
// Assert that commands like "args", "locals", etc... will
// return an error instead of panic.
s, err := proc.ThreadScope(p, p.CurrentThread())
assertNoError(err, t, "ThreadScope")
_, err = s.Locals(0)
if err == nil {
t.Error("expected an error to be returned from scope.Locals in stripped binary")
}
})
}
func TestDebugStripped2(t *testing.T) {
// Currently only implemented for Linux ELF executables.
// TODO(derekparker): Add support for PE.
skipOn(t, "not working on windows", "windows")
skipOn(t, "not working on freebsd", "freebsd")