S3: Correctly defer closing response body, unless nil

alex0z1 · Mar 31, 2014 · 51ed81f · 51ed81f
1 parent 20a8220
commit 51ed81f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/s3/s3.go b/s3/s3.go
@@ -168,11 +168,15 @@ func (b *Bucket) DelBucket() (err error) {
 // See http://goo.gl/isCO7 for details.
 func (b *Bucket) Get(path string) (data []byte, err error) {
 	body, err := b.GetReader(path)
+	defer func() {
+		if body != nil {
+			body.Close()
+		}
+	}()
 	if err != nil {
 		return nil, err
 	}
 	data, err = ioutil.ReadAll(body)
-	body.Close()
 	return data, err
 }