kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

*: fix response body leaks

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-03-16 16:38:13 +01:00
parent 2b1b235acf
commit f0d83c4cdb
5 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/client/build.go
View file

@ -236,6 +236,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
if err != nil { if err != nil {
return err return err
} }
defer response.Body.Close()
err = jsonmessage.DisplayJSONMessagesStream(response.Body, buildBuff, cli.outFd, cli.isTerminalOut, nil) err = jsonmessage.DisplayJSONMessagesStream(response.Body, buildBuff, cli.outFd, cli.isTerminalOut, nil)
if err != nil { if err != nil {

1
daemon/graphdriver/proxy.go
View file

@ -161,7 +161,6 @@ func (d *graphDriverProxy) Diff(id, parent string) (archive.Archive, error) {
} }
body, err := d.client.Stream("GraphDriver.Diff", args) body, err := d.client.Stream("GraphDriver.Diff", args)
if err != nil { if err != nil {
body.Close()
return nil, err return nil, err
} }
return archive.Archive(body), nil return archive.Archive(body), nil

4
daemon/logger/splunk/splunk.go
View file

@ -174,9 +174,7 @@ func (l *splunkLogger) Log(msg *logger.Message) error {
if err != nil { if err != nil {
return err return err
} }
if res.Body != nil { defer res.Body.Close()
defer res.Body.Close()
}
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
var body []byte var body []byte
body, err = ioutil.ReadAll(res.Body) body, err = ioutil.ReadAll(res.Body)

1
pkg/plugins/client.go
View file

@ -101,6 +101,7 @@ func (c *Client) SendFile(serviceMethod string, data io.Reader, ret interface{})
if err != nil { if err != nil {
return err return err
} }
defer body.Close()
if err := json.NewDecoder(body).Decode(&ret); err != nil { if err := json.NewDecoder(body).Decode(&ret); err != nil {
logrus.Errorf("%s: error reading plugin resp: %v", serviceMethod, err) logrus.Errorf("%s: error reading plugin resp: %v", serviceMethod, err)
return err return err

1
registry/session.go
View file

@ -284,6 +284,7 @@ func (r *Session) GetRemoteImageLayer(imgID, registry string, imgSize int64) (io
res, err = r.client.Do(req) res, err = r.client.Do(req)
if err != nil { if err != nil {
logrus.Debugf("Error contacting registry %s: %v", registry, err) logrus.Debugf("Error contacting registry %s: %v", registry, err)
// the only case err != nil && res != nil is https://golang.org/src/net/http/client.go#L515
if res != nil { if res != nil {
if res.Body != nil { if res.Body != nil {
res.Body.Close() res.Body.Close()