From f15c5a7cd26320fef80ce0b3ca8829f48296786c Mon Sep 17 00:00:00 2001
From: mpl <mathieu.lonjaret@gmail.com>
Date: Tue, 7 Oct 2014 16:46:25 +0200
Subject: [PATCH] index/receive: address last comments from
 http://camlistore.org/r/3271

Change-Id: Id41278e5e01b9ea9310b392859709a3261dc3f52
---
 pkg/index/receive.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/index/receive.go b/pkg/index/receive.go
index bf577825a..773f57e32 100644
--- a/pkg/index/receive.go
+++ b/pkg/index/receive.go
@@ -393,8 +393,10 @@ func (ix *Index) populateFile(fetcher blob.Fetcher, b *schema.Blob, mm *mutation
 		conf, err := images.DecodeConfig(bytes.NewReader(imageBuf.Bytes))
 		// If our optimistic 512KB in-memory prefix from above was too short to get the dimensions, pass the whole thing instead and try again.
 		if err == io.ErrUnexpectedEOF {
-			if fr, e := b.NewFileReader(fetcher); e == nil {
+			fr, err := b.NewFileReader(fetcher)
+			if err == nil {
 				conf, err = images.DecodeConfig(fr)
+				fr.Close()
 			}
 		}
 		if err == nil {
@@ -409,8 +411,10 @@ func (ix *Index) populateFile(fetcher blob.Fetcher, b *schema.Blob, mm *mutation
 
 		err = indexEXIF(wholeRef, bytes.NewReader(imageBuf.Bytes), mm)
 		if err == io.EOF {
-			if fr, e := b.NewFileReader(fetcher); e == nil {
+			fr, err := b.NewFileReader(fetcher)
+			if err == nil {
 				err = indexEXIF(wholeRef, fr, mm)
+				fr.Close()
 			}
 		}
 		if err != nil {