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

terminal: bugfix: deref of nil SelectedGoroutine switching goroutines (#829)

Browse Source 
If CurrentThread isn't running a goroutine SelectedGoroutine can be
nil, do not blindly dereference it.

Fixes #827
This commit is contained in:
Alessandro Arzilli
2017-05-08 20:16:14 +02:00
committed by Derek Parker
parent f6091694b6
commit 98a4ff7a9f
3 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/terminal/command_test.go
View File

@ -5,12 +5,14 @@ import (
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
"path/filepath"
"regexp"
"strconv"
"strings"
"testing"
"time"
"github.com/derekparker/delve/pkg/proc/test"
"github.com/derekparker/delve/service"
@ -38,6 +40,8 @@ type FakeTerminal struct {
t testing.TB
}
const logCommandOutput = false
func (ft *FakeTerminal) Exec(cmdstr string) (outstr string, err error) {
outfh, err := ioutil.TempFile("", "cmdtestout")
if err != nil {
@ -54,6 +58,9 @@ func (ft *FakeTerminal) Exec(cmdstr string) (outstr string, err error) {
ft.t.Fatalf("could not read temporary output file: %v", err)
}
outstr = string(outbs)
if logCommandOutput {
ft.t.Logf("command %q -> %q", cmdstr, outstr)
}
os.Remove(outfh.Name())
}()
err = ft.cmds.Call(cmdstr, ft.Term)
@ -581,3 +588,18 @@ func TestCheckpoints(t *testing.T) {
listIsAt(t, term, "restart c1", 16, -1, -1)
})
}
func TestIssue827(t *testing.T) {
// switching goroutines when the current thread isn't running any goroutine
// causes nil pointer dereference.
withTestTerminal("notify-v2", t, func(term *FakeTerminal) {
go func() {
time.Sleep(1 * time.Second)
http.Get("http://127.0.0.1:8888/test")
time.Sleep(1 * time.Second)
term.client.Halt()
}()
term.MustExec("continue")
term.MustExec("goroutine 1")
})
}