always close file

cenkalti · cenkalti · commit a3007ae87c17 · 2019-12-24T16:51:48.000+03:00
diff --git a/filereceiver.go b/filereceiver.go
@@ -148,9 +148,9 @@ func saveFile(path string, offset int64, length int64, r io.Reader, log log.Logg
 	if err != nil {
 		return 0, nil, err
 	}
+	defer logCloseFile(log, f)
 	_, err = f.Seek(offset, io.SeekStart)
 	if err != nil {
-		logCloseFile(log, f)
 		return 0, nil, err
 	}
 	w := io.MultiWriter(f, fi.Digest.CRC32, fi.Digest.Sha1)

Original file line number	Diff line number	Diff line change
`@@ -148,9 +148,9 @@ func saveFile(path string, offset int64, length int64, r io.Reader, log log.Logg`
`148`	`148`	`if err != nil {`
`149`	`149`	`return 0, nil, err`
`150`	`150`	`}`
	`151`	`+ defer logCloseFile(log, f)`
`151`	`152`	`_, err = f.Seek(offset, io.SeekStart)`
`152`	`153`	`if err != nil {`
`153`		`- logCloseFile(log, f)`
`154`	`154`	`return 0, nil, err`
`155`	`155`	`}`
`156`	`156`	`w := io.MultiWriter(f, fi.Digest.CRC32, fi.Digest.Sha1)`