Commit7fd6136

committed

Fix dial panic when ctx is nil

When the ctx is nil, http.NewRequestWithContext returns a "net/http:nil Context" error and a nil request. In this case, the dial functionpanics because it assumes the req is never nil. This checks thereturning error and returns it, so that callers get an error insteadof a panic in that scenario.

1 parent14fb98e commit7fd6136Copy full SHA for 7fd6136

File tree

2 files changed

+20

-7

lines changed

2 files changed

+20

-7

lines changed

`‎dial.go‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,10 @@ func handshakeRequest(ctx context.Context, urls string, opts *DialOptions, copts`
`157`	`157`	`returnnil,fmt.Errorf("unexpected url scheme: %q",u.Scheme)`
`158`	`158`	`}`
`159`	`159`
`160`		`-req,_:=http.NewRequestWithContext(ctx,"GET",u.String(),nil)`
	`160`	`+req,err:=http.NewRequestWithContext(ctx,"GET",u.String(),nil)`
	`161`	`+iferr!=nil {`
	`162`	`+returnnil,fmt.Errorf("failed to build HTTP request: %w",err)`
	`163`	`+}`
`161`	`164`	`req.Header=opts.HTTPHeader.Clone()`
`162`	`165`	`req.Header.Set("Connection","Upgrade")`
`163`	`166`	`req.Header.Set("Upgrade","websocket")`

`‎dial_test.go‎`

Lines changed: 16 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,11 @@ func TestBadDials(t *testing.T) {`
`23`	`23`	`t.Parallel()`
`24`	`24`
`25`	`25`	`testCases:= []struct {`
`26`		`-namestring`
`27`		`-urlstring`
`28`		`-opts*DialOptions`
`29`		`-randreaderFunc`
	`26`	`+namestring`
	`27`	`+urlstring`
	`28`	`+opts*DialOptions`
	`29`	`+randreaderFunc`
	`30`	`+nilCtxbool`
`30`	`31`	`}{`
`31`	`32`	`{`
`32`	`33`	`name:"badURL",`
`@@ -46,15 +47,24 @@ func TestBadDials(t *testing.T) {`
`46`	`47`	`return0,io.EOF`
`47`	`48`	`},`
`48`	`49`	`},`
	`50`	`+{`
	`51`	`+name:"nilContext",`
	`52`	`+url:"http://localhost",`
	`53`	`+nilCtx:true,`
	`54`	`+},`
`49`	`55`	`}`
`50`	`56`
`51`	`57`	`for_,tc:=rangetestCases {`
`52`	`58`	`tc:=tc`
`53`	`59`	`t.Run(tc.name,func(t*testing.T) {`
`54`	`60`	`t.Parallel()`
`55`	`61`
`56`		`-ctx,cancel:=context.WithTimeout(context.Background(),time.Second*5)`
`57`		`-defercancel()`
	`62`	`+varctx context.Context`
	`63`	`+varcancelfunc()`
	`64`	`+if!tc.nilCtx {`
	`65`	`+ctx,cancel=context.WithTimeout(context.Background(),time.Second*5)`
	`66`	`+defercancel()`
	`67`	`+}`
`58`	`68`
`59`	`69`	`iftc.rand==nil {`
`60`	`70`	`tc.rand=rand.Reader.Read`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7fd6136

File tree

2 files changed

2 files changed

`‎dial.go‎`

`‎dial_test.go‎`

0 commit comments