Merge pull request moby#21258 from runcom/res.body.leaks

calavera · calavera · commit b1e9a5eaf1c8 · 2016-03-16T19:20:10.000-07:00
*: fix response body leaks
diff --git a/api/client/build.go b/api/client/build.go
@@ -236,6 +236,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
 	if err != nil {
 		return err
 	}
+	defer response.Body.Close()
 
 	err = jsonmessage.DisplayJSONMessagesStream(response.Body, buildBuff, cli.outFd, cli.isTerminalOut, nil)
 	if err != nil {
diff --git a/daemon/graphdriver/proxy.go b/daemon/graphdriver/proxy.go
@@ -161,7 +161,6 @@ func (d *graphDriverProxy) Diff(id, parent string) (archive.Archive, error) {
 	}
 	body, err := d.client.Stream("GraphDriver.Diff", args)
 	if err != nil {
-		body.Close()
 		return nil, err
 	}
 	return archive.Archive(body), nil
diff --git a/daemon/logger/splunk/splunk.go b/daemon/logger/splunk/splunk.go
@@ -174,9 +174,7 @@ func (l *splunkLogger) Log(msg *logger.Message) error {
 	if err != nil {
 		return err
 	}
-	if res.Body != nil {
-		defer res.Body.Close()
-	}
+	defer res.Body.Close()
 	if res.StatusCode != http.StatusOK {
 		var body []byte
 		body, err = ioutil.ReadAll(res.Body)
diff --git a/pkg/plugins/client.go b/pkg/plugins/client.go
@@ -101,6 +101,7 @@ func (c *Client) SendFile(serviceMethod string, data io.Reader, ret interface{})
 	if err != nil {
 		return err
 	}
+	defer body.Close()
 	if err := json.NewDecoder(body).Decode(&ret); err != nil {
 		logrus.Errorf("%s: error reading plugin resp: %v", serviceMethod, err)
 		return err
diff --git a/registry/session.go b/registry/session.go
@@ -284,6 +284,7 @@ func (r *Session) GetRemoteImageLayer(imgID, registry string, imgSize int64) (io
 	res, err = r.client.Do(req)
 	if err != nil {
 		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.Body != nil {
 				res.Body.Close()

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {`
`236`	`236`	`if err != nil {`
`237`	`237`	`return err`
`238`	`238`	`}`
	`239`	`+ defer response.Body.Close()`
`239`	`240`
`240`	`241`	`err = jsonmessage.DisplayJSONMessagesStream(response.Body, buildBuff, cli.outFd, cli.isTerminalOut, nil)`
`241`	`242`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,6 @@ func (d *graphDriverProxy) Diff(id, parent string) (archive.Archive, error) {`
`161`	`161`	`}`
`162`	`162`	`body, err := d.client.Stream("GraphDriver.Diff", args)`
`163`	`163`	`if err != nil {`
`164`		`- body.Close()`
`165`	`164`	`return nil, err`
`166`	`165`	`}`
`167`	`166`	`return archive.Archive(body), nil`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ func (c *Client) SendFile(serviceMethod string, data io.Reader, ret interface{})`
`101`	`101`	`if err != nil {`
`102`	`102`	`return err`
`103`	`103`	`}`
	`104`	`+ defer body.Close()`
`104`	`105`	`if err := json.NewDecoder(body).Decode(&ret); err != nil {`
`105`	`106`	`logrus.Errorf("%s: error reading plugin resp: %v", serviceMethod, err)`
`106`	`107`	`return err`