github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Making sure we handle error on http.NewRequest().

Browse Source 
http.NewRequest can return an error. (Eg. error parsing url).
This will cause us to have a nil req object.
That in turn will become a SIGSEGV when we set the context.
This commit is contained in:
Walter Fender 2019-07-02 14:28:55 -07:00
parent 03291ca467
commit ee2ad1d1fe
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/registry/generic/rest/streamer.go
View File

@ -19,6 +19,7 @@ package rest
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"io" "io"
"net/http" "net/http"
"net/url" "net/url"
@ -66,6 +67,9 @@ func (s *LocationStreamer) InputStream(ctx context.Context, apiVersion, acceptHe
CheckRedirect: s.RedirectChecker, CheckRedirect: s.RedirectChecker,
} }
req, err := http.NewRequest("GET", s.Location.String(), nil) req, err := http.NewRequest("GET", s.Location.String(), nil)
if err != nil {
return nil, false, "", fmt.Errorf("failed to construct request for %s, got %v", s.Location.String(), err)
}
// Pass the parent context down to the request to ensure that the resources // Pass the parent context down to the request to ensure that the resources
// will be release properly. // will be release properly.
req = req.WithContext(ctx) req = req.WithContext(ctx)