From: marwan-at-work <marwan.sameer@gmail.com>
Date: Sun, 22 Jul 2018 20:23:29 +0000 (+0000)
Subject: cmd/go/internal/modfetch: do not panic when zip is incorrect
X-Git-Tag: go1.11beta3~99
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=62f401bf18d786b01fcef933610b43dd284e5095;p=gostls13.git

cmd/go/internal/modfetch: do not panic when zip is incorrect

Fixes #26536

Change-Id: I75d284bd39af0a06e31d18c7f7745c5a8ecbe6ac
GitHub-Last-Rev: 88040a9edb0cb547a498cb8c8b662eb8729eb8bf
GitHub-Pull-Request: golang/go#26537
Reviewed-on: https://go-review.googlesource.com/125436
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/cmd/go/internal/modfetch/fetch.go b/src/cmd/go/internal/modfetch/fetch.go
index 110312bbe0..375c3f1478 100644
--- a/src/cmd/go/internal/modfetch/fetch.go
+++ b/src/cmd/go/internal/modfetch/fetch.go
@@ -90,7 +90,6 @@ func downloadZip(mod module.Version, target string) error {
 	// Double-check zip file looks OK.
 	z, err := zip.OpenReader(tmpfile)
 	if err != nil {
-		z.Close()
 		return err
 	}
 	prefix := mod.Path + "@" + mod.Version