diff options
| author | Dmitry Chestnykh <dchest@gmail.com> | 2011-11-07 16:33:53 +1100 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2011-11-07 16:33:53 +1100 |
| commit | ad0e8b31d82f2a220cd98463014a79211d173df7 (patch) | |
| tree | e70a2216a9d75f768f6817d5378808d2be6c7b96 | |
| parent | 75af79b9b59548c3177b7a0307d6ab75fbbd87a2 (diff) | |
| download | go-ad0e8b31d82f2a220cd98463014a79211d173df7.tar.gz go-ad0e8b31d82f2a220cd98463014a79211d173df7.zip | |
archive/zip: actually close file opened with OpenReader.
R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/5341044
| -rw-r--r-- | src/pkg/archive/zip/reader.go | 1 | ||||
| -rw-r--r-- | src/pkg/archive/zip/reader_test.go | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/pkg/archive/zip/reader.go b/src/pkg/archive/zip/reader.go index b705ebe7ea..cfbe5498a1 100644 --- a/src/pkg/archive/zip/reader.go +++ b/src/pkg/archive/zip/reader.go @@ -60,6 +60,7 @@ func OpenReader(name string) (*ReadCloser, error) { f.Close() return nil, err } + r.f = f return r, nil } diff --git a/src/pkg/archive/zip/reader_test.go b/src/pkg/archive/zip/reader_test.go index 4d80aab709..ca0b04e2bb 100644 --- a/src/pkg/archive/zip/reader_test.go +++ b/src/pkg/archive/zip/reader_test.go @@ -98,7 +98,11 @@ func readTestZip(t *testing.T, zt ZipTest) { if err == FormatError { return } - defer z.Close() + defer func() { + if err := z.Close(); err != nil { + t.Errorf("error %q when closing zip file", err) + } + }() // bail here if no Files expected to be tested // (there may actually be files in the zip, but we don't care) |