Fix file closing

myitcv · flimzy · commit 1198293ad9ad · 2021-12-28T12:24:21.000+01:00
diff --git a/build/build.go b/build/build.go
@@ -606,10 +606,10 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 		if err != nil {
 			return nil, fmt.Errorf("could not open %v: %v", binPath, err)
 		}
-		defer binFile.Close()
 
 		binHash := sha256.New()
 		io.Copy(binHash, binFile)
+		binFile.Close()
 		fmt.Fprintf(pkgHash, "gopherjs bin: %#x\n", binHash.Sum(nil))
 
 		orderedBuildTags := append([]string{}, s.options.BuildTags...)
@@ -654,6 +654,7 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 			}
 			fmt.Fprintf(pkgHash, "file: %v\n", fp)
 			n, _ := io.Copy(pkgHash, file)
+			file.Close()
 			fmt.Fprintf(pkgHash, "%d bytes\n", n)
 		}
 
@@ -669,9 +670,9 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 			}
 			return nil, err
 		}
-		defer objFile.Close()
 
 		archive, err := compiler.ReadArchive(pkg.PkgObj, pkg.ImportPath, objFile, s.Types)
+		objFile.Close()
 		if err != nil {
 			return nil, err
 		}

Original file line number	Diff line number	Diff line change
`@@ -606,10 +606,10 @@ func (s Session) BuildPackage(pkg PackageData) (*compiler.Archive, error) {`
`606`	`606`	`if err != nil {`
`607`	`607`	`return nil, fmt.Errorf("could not open %v: %v", binPath, err)`
`608`	`608`	`}`
`609`		`- defer binFile.Close()`
`610`	`609`
`611`	`610`	`binHash := sha256.New()`
`612`	`611`	`io.Copy(binHash, binFile)`
	`612`	`+ binFile.Close()`
`613`	`613`	`fmt.Fprintf(pkgHash, "gopherjs bin: %#x\n", binHash.Sum(nil))`
`614`	`614`
`615`	`615`	`orderedBuildTags := append([]string{}, s.options.BuildTags...)`
`@@ -654,6 +654,7 @@ func (s Session) BuildPackage(pkg PackageData) (*compiler.Archive, error) {`
`654`	`654`	`}`
`655`	`655`	`fmt.Fprintf(pkgHash, "file: %v\n", fp)`
`656`	`656`	`n, _ := io.Copy(pkgHash, file)`
	`657`	`+ file.Close()`
`657`	`658`	`fmt.Fprintf(pkgHash, "%d bytes\n", n)`
`658`	`659`	`}`
`659`	`660`
`@@ -669,9 +670,9 @@ func (s Session) BuildPackage(pkg PackageData) (*compiler.Archive, error) {`
`669`	`670`	`}`
`670`	`671`	`return nil, err`
`671`	`672`	`}`
`672`		`- defer objFile.Close()`
`673`	`673`
`674`	`674`	`archive, err := compiler.ReadArchive(pkg.PkgObj, pkg.ImportPath, objFile, s.Types)`
	`675`	`+ objFile.Close()`
`675`	`676`	`if err != nil {`
`676`	`677`	`return nil, err`
`677`	`678`	`}`