qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 11:48:04 -07:00
Code Releases Activity

http: avoid panic caused by nil URL

Browse Source 
The current code will panic if an invalid
request (one with a nil URL) is passed to
the doFollowingRedirects function.

Also, remove a redundant nil Header check.

R=bradfitz
CC=golang-dev
https://golang.org/cl/5270046
This commit is contained in:
Anthony Martin 2011-10-14 17:09:38 -07:00 committed by Brad Fitzpatrick
parent c5b3a4fb07
commit b5077f82fa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pkg/http/client.go
View File

@ -115,9 +115,6 @@ func send(req *Request, t RoundTripper) (resp *Response, err os.Error) {
info := req.URL.RawUserinfo info := req.URL.RawUserinfo
if len(info) > 0 { if len(info) > 0 {
if req.Header == nil {
req.Header = make(Header)
}
req.Header.Set("Authorization", "Basic "+base64.URLEncoding.EncodeToString([]byte(info))) req.Header.Set("Authorization", "Basic "+base64.URLEncoding.EncodeToString([]byte(info)))
} }
return t.RoundTrip(req) return t.RoundTrip(req)
@ -176,6 +173,10 @@ func (c *Client) doFollowingRedirects(ireq *Request) (r *Response, err os.Error)
} }
var via []*Request var via []*Request
if ireq.URL == nil {
return nil, os.NewError("http: nil Request.URL")
}
req := ireq req := ireq
urlStr := "" // next relative or absolute URL to fetch (after first request) urlStr := "" // next relative or absolute URL to fetch (after first request)
for redirect := 0; ; redirect++ { for redirect := 0; ; redirect++ {