aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Matloob <matloob@golang.org>2024-02-06 13:07:54 -0500
committerMichael Matloob <matloob@golang.org>2024-02-06 21:01:53 +0000
commit8984be28e84911c8a2f2c2e43ccee127bb87259d (patch)
tree663b77dcc26e3820b5c7b0307b9fbf4145712bec
parent299e4eeccd45e52ad60e6fc877aab00c8ef95814 (diff)
downloadgo-x-pkgsite-8984be28e84911c8a2f2c2e43ccee127bb87259d.tar.xz
internal/fetch: close directory file in defer in extractReadme
This addresses bcmills's comment in CL 559615 Fixes golang/go#65545. Change-Id: I02a4ba48eb897f33b4f4c47911e9cc80c99f7869 Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/562176 TryBot-Result: Gopher Robot <gobot@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> kokoro-CI: kokoro <noreply+kokoro@google.com> Run-TryBot: Michael Matloob <matloob@golang.org> Reviewed-by: Bryan Mills <bcmills@google.com>
-rw-r--r--internal/fetch/readme.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/internal/fetch/readme.go b/internal/fetch/readme.go
index e38bdb3c..b5d8c20c 100644
--- a/internal/fetch/readme.go
+++ b/internal/fetch/readme.go
@@ -35,6 +35,12 @@ func extractReadme(modulePath, dir, resolvedVersion string, contentDir fs.FS) (_
}
return nil, err
}
+ defer func() {
+ cerr := f.Close()
+ if err == nil {
+ err = cerr
+ }
+ }()
rdf, ok := f.(fs.ReadDirFile)
if !ok {
return nil, fmt.Errorf("could not open directory for %v", dir)