golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-10-30 02:07:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

proc: do not panic if we can't satisfy a composite location

Browse Source 
When a location expression requests a register check that we have as
many bytes in the register as requested and if we don't report the
error.

Updates #1416
This commit is contained in:
aarzilli
2018-11-19 14:22:43 +01:00
committed by Derek Parker
parent 11accd4d71
commit 7f53117ea9
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/proc/mem.go
View File

@ -2,6 +2,7 @@ package proc
import (
"errors"
"fmt"
"github.com/derekparker/delve/pkg/dwarf/op"
)
@ -93,7 +94,7 @@ type compositeMemory struct {
data []byte
}
func newCompositeMemory(mem MemoryReadWriter, regs op.DwarfRegisters, pieces []op.Piece) *compositeMemory {
func newCompositeMemory(mem MemoryReadWriter, regs op.DwarfRegisters, pieces []op.Piece) (*compositeMemory, error) {
cmem := &compositeMemory{realmem: mem, regs: regs, pieces: pieces, data: []byte{}}
for _, piece := range pieces {
if piece.IsRegister {
@ -102,6 +103,9 @@ func newCompositeMemory(mem MemoryReadWriter, regs op.DwarfRegisters, pieces []o
if sz == 0 && len(pieces) == 1 {
sz = len(reg)
}
if sz > len(reg) {
return nil, fmt.Errorf("could not read %d bytes from register %d (size: %d)", sz, piece.RegNum, len(reg))
}
cmem.data = append(cmem.data, reg[:sz]...)
} else {
buf := make([]byte, piece.Size)
@ -109,7 +113,7 @@ func newCompositeMemory(mem MemoryReadWriter, regs op.DwarfRegisters, pieces []o
cmem.data = append(cmem.data, buf...)
}
}
return cmem
return cmem, nil
}
func (mem *compositeMemory) ReadMemory(data []byte, addr uintptr) (int, error) {

5
pkg/proc/variables.go
View File

@ -908,7 +908,10 @@ func (scope *EvalScope) extractVarInfoFromEntry(varEntry *dwarf.Entry) (*Variabl
mem := scope.Mem
if pieces != nil {
addr = fakeAddress
mem = newCompositeMemory(scope.Mem, scope.Regs, pieces)
mem, err = newCompositeMemory(scope.Mem, scope.Regs, pieces)
if mem == nil {
mem = scope.Mem
}
}
v := scope.newVariable(n, uintptr(addr), t, mem)