Skip to content
This repository was archived by the owner on Feb 1, 2021. It is now read-only.

close http response body to avoid potential memory leak #2176

Merged
merged 1 commit into from
Apr 29, 2016
+7 −2
Merged

close http response body to avoid potential memory leak #2176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions cluster/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,14 +988,16 @@ func (e *Engine) Pull(image string, authConfig *types.AuthConfig) error {
if err != nil {
return err
}
pullResponse, err := e.apiClient.ImagePull(context.Background(), pullOpts, nil)
pullResponseBody, err := e.apiClient.ImagePull(context.Background(), pullOpts, nil)
e.CheckConnectionErr(err)
if err != nil {
return err
}

defer pullResponseBody.Close()

// wait until the image download is finished
dec := json.NewDecoder(pullResponse)
dec := json.NewDecoder(pullResponseBody)
m := map[string]interface{}{}
for {
if err := dec.Decode(&m); err != nil {
Expand Down Expand Up @@ -1023,8 +1025,11 @@ func (e *Engine) Load(reader io.Reader) error {
return err
}

defer loadResponse.Body.Close()

// wait until the image load is finished
dec := json.NewDecoder(loadResponse.Body)

m := map[string]interface{}{}
for {
if err := dec.Decode(&m); err != nil {
Expand Down