golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-11-01 20:20:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

proc/variables: bugfix: infinite loading loop through maps

Browse Source 
Fixes #341
This commit is contained in:
aarzilli
2016-01-10 10:04:14 +01:00
parent 26c0307aef
commit 6d50aba71d
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
proc/proc_test.go
View File

@ -1264,3 +1264,14 @@ func TestIssue262(t *testing.T) {
}
})
}
func TestIssue341(t *testing.T) {
// pointer loop through map entries
withTestProcess("testvariables3", t, func(p *Process, fixture protest.Fixture) {
assertNoError(p.Continue(), t, "Continue()")
t.Logf("requesting mapinf")
mapinf, err := evalVariable(p, "mapinf")
assertNoError(err, t, "EvalVariable()")
t.Logf("mapinf: %v\n", mapinf)
})
}

8
proc/variables.go
View File

@ -1160,8 +1160,10 @@ func (v *Variable) loadMap(recurseLevel int) {
}
key := it.key()
val := it.value()
key.loadValue()
val.loadValue()
if recurseLevel <= maxVariableRecurse {
key.loadValueInternal(recurseLevel + 1)
val.loadValueInternal(recurseLevel + 1)
}
if key.Unreadable != nil || val.Unreadable != nil {
errcount++
}
@ -1428,7 +1430,7 @@ func (v *Variable) loadInterface(recurseLevel int, loadData bool) {
// interface to nil
data = data.maybeDereference()
v.Children = []Variable{*data}
v.Children[0].loadValue()
v.Children[0].loadValueInternal(recurseLevel)
return
}