From: Robert Obryk <robryk@gmail.com>
Date: Thu, 6 Jun 2013 04:16:44 +0000 (-0700)
Subject: io/ioutil: make WriteFile notice errors from Close()
X-Git-Tag: go1.2rc2~1312
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=961411900730bd8dd14781ce8e965701eefe5577;p=gostls13.git

io/ioutil: make WriteFile notice errors from Close()

WriteFile should not successfully return if the file's
Close call failed.

Fixes #5644.

R=golang-dev, kr, r
CC=golang-dev
https://golang.org/cl/10067043
---

diff --git a/src/pkg/io/ioutil/ioutil.go b/src/pkg/io/ioutil/ioutil.go
index 6b395c69bd..ce8d8b48ac 100644
--- a/src/pkg/io/ioutil/ioutil.go
+++ b/src/pkg/io/ioutil/ioutil.go
@@ -78,10 +78,12 @@ func WriteFile(filename string, data []byte, perm os.FileMode) error {
 		return err
 	}
 	n, err := f.Write(data)
-	f.Close()
 	if err == nil && n < len(data) {
 		err = io.ErrShortWrite
 	}
+	if err1 := f.Close(); err == nil {
+		err = err1
+	}
 	return err
 }