golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-10-28 04:35:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

proc/native: error when reading/writing memory of exited process (#812)

Browse Source 
Fixes #809
This commit is contained in:
Alessandro Arzilli
2017-05-01 18:57:37 +02:00
committed by Derek Parker
parent a731eb661f
commit dcf51a5032
5 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/proc/gdbserial/gdbserver.go
View File

@ -554,6 +554,9 @@ func (p *Process) StepInstruction() error {
} }
func (p *Process) SwitchThread(tid int) error { func (p *Process) SwitchThread(tid int) error {
if p.exited {
return proc.ProcessExitedError{Pid: p.conn.pid}
}
if th, ok := p.threads[tid]; ok { if th, ok := p.threads[tid]; ok {
p.currentThread = th p.currentThread = th
p.selectedGoroutine, _ = proc.GetG(p.CurrentThread()) p.selectedGoroutine, _ = proc.GetG(p.CurrentThread())

8
pkg/proc/native/threads_darwin.go
View File

@ -8,6 +8,8 @@ import (
"unsafe" "unsafe"
sys "golang.org/x/sys/unix" sys "golang.org/x/sys/unix"
"github.com/derekparker/delve/pkg/proc"
) )
// WaitStatus is a synonym for the platform-specific WaitStatus // WaitStatus is a synonym for the platform-specific WaitStatus
@ -105,6 +107,9 @@ func (t *Thread) stopped() bool {
} }
func (t *Thread) WriteMemory(addr uintptr, data []byte) (int, error) { func (t *Thread) WriteMemory(addr uintptr, data []byte) (int, error) {
if t.dbp.exited {
return 0, proc.ProcessExitedError{Pid: t.dbp.pid}
}
if len(data) == 0 { if len(data) == 0 {
return 0, nil return 0, nil
} }
@ -120,6 +125,9 @@ func (t *Thread) WriteMemory(addr uintptr, data []byte) (int, error) {
} }
func (t *Thread) ReadMemory(buf []byte, addr uintptr) (int, error) { func (t *Thread) ReadMemory(buf []byte, addr uintptr) (int, error) {
if t.dbp.exited {
return 0, proc.ProcessExitedError{Pid: t.dbp.pid}
}
if len(buf) == 0 { if len(buf) == 0 {
return 0, nil return 0, nil
} }

6
pkg/proc/native/threads_linux.go
View File

@ -97,6 +97,9 @@ func (t *Thread) restoreRegisters() (err error) {
} }
func (t *Thread) WriteMemory(addr uintptr, data []byte) (written int, err error) { func (t *Thread) WriteMemory(addr uintptr, data []byte) (written int, err error) {
if t.dbp.exited {
return 0, proc.ProcessExitedError{Pid: t.dbp.pid}
}
if len(data) == 0 { if len(data) == 0 {
return return
} }
@ -105,6 +108,9 @@ func (t *Thread) WriteMemory(addr uintptr, data []byte) (written int, err error)
} }
func (t *Thread) ReadMemory(data []byte, addr uintptr) (n int, err error) { func (t *Thread) ReadMemory(data []byte, addr uintptr) (n int, err error) {
if t.dbp.exited {
return 0, proc.ProcessExitedError{Pid: t.dbp.pid}
}
if len(data) == 0 { if len(data) == 0 {
return return
} }

6
pkg/proc/native/threads_windows.go
View File

@ -133,6 +133,9 @@ func (t *Thread) stopped() bool {
} }
func (t *Thread) WriteMemory(addr uintptr, data []byte) (int, error) { func (t *Thread) WriteMemory(addr uintptr, data []byte) (int, error) {
if t.dbp.exited {
return 0, proc.ProcessExitedError{Pid: t.dbp.pid}
}
var count uintptr var count uintptr
err := _WriteProcessMemory(t.dbp.os.hProcess, addr, &data[0], uintptr(len(data)), &count) err := _WriteProcessMemory(t.dbp.os.hProcess, addr, &data[0], uintptr(len(data)), &count)
if err != nil { if err != nil {
@ -144,6 +147,9 @@ func (t *Thread) WriteMemory(addr uintptr, data []byte) (int, error) {
var ErrShortRead = errors.New("short read") var ErrShortRead = errors.New("short read")
func (t *Thread) ReadMemory(buf []byte, addr uintptr) (int, error) { func (t *Thread) ReadMemory(buf []byte, addr uintptr) (int, error) {
if t.dbp.exited {
return 0, proc.ProcessExitedError{Pid: t.dbp.pid}
}
if len(buf) == 0 { if len(buf) == 0 {
return 0, nil return 0, nil
} }

7
service/test/common_test.go
View File

@ -5,6 +5,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings"
"testing" "testing"
"github.com/derekparker/delve/service/api" "github.com/derekparker/delve/service/api"
@ -24,6 +25,12 @@ func assertError(err error, t *testing.T, s string) {
fname := filepath.Base(file) fname := filepath.Base(file)
t.Fatalf("failed assertion at %s:%d: %s (no error)\n", fname, line, s) t.Fatalf("failed assertion at %s:%d: %s (no error)\n", fname, line, s)
} }
if strings.Index(err.Error(), "Internal debugger error") >= 0 {
_, file, line, _ := runtime.Caller(1)
fname := filepath.Base(file)
t.Fatalf("failed assertion at %s:%d: %s internal debugger error: %v\n", fname, line, s, err)
}
} }
func init() { func init() {