Commit 0fd53d8b authored by Brad Fitzpatrick's avatar Brad Fitzpatrick

misc/dist: check return value from filepath.Walk

Doesn't fix any known issue. This bit me in some unrelated
code and I thought of this tool.

R=golang-dev, krautz, mikkel
CC=golang-dev
https://golang.org/cl/5976067
parent bcdafaa5
...@@ -556,7 +556,7 @@ func makeTar(targ, workdir string) error { ...@@ -556,7 +556,7 @@ func makeTar(targ, workdir string) error {
zout := gzip.NewWriter(f) zout := gzip.NewWriter(f)
tw := tar.NewWriter(zout) tw := tar.NewWriter(zout)
filepath.Walk(workdir, filepath.WalkFunc(func(path string, fi os.FileInfo, err error) error { err = filepath.Walk(workdir, func(path string, fi os.FileInfo, err error) error {
if !strings.HasPrefix(path, workdir) { if !strings.HasPrefix(path, workdir) {
log.Panicf("walked filename %q doesn't begin with workdir %q", path, workdir) log.Panicf("walked filename %q doesn't begin with workdir %q", path, workdir)
} }
...@@ -605,8 +605,10 @@ func makeTar(targ, workdir string) error { ...@@ -605,8 +605,10 @@ func makeTar(targ, workdir string) error {
defer r.Close() defer r.Close()
_, err = io.Copy(tw, r) _, err = io.Copy(tw, r)
return err return err
})) })
if err != nil {
return err
}
if err := tw.Close(); err != nil { if err := tw.Close(); err != nil {
return err return err
} }
...@@ -623,7 +625,7 @@ func makeZip(targ, workdir string) error { ...@@ -623,7 +625,7 @@ func makeZip(targ, workdir string) error {
} }
zw := zip.NewWriter(f) zw := zip.NewWriter(f)
filepath.Walk(workdir, filepath.WalkFunc(func(path string, fi os.FileInfo, err error) error { err = filepath.Walk(workdir, func(path string, fi os.FileInfo, err error) error {
if fi.IsDir() { if fi.IsDir() {
return nil return nil
} }
...@@ -664,8 +666,10 @@ func makeZip(targ, workdir string) error { ...@@ -664,8 +666,10 @@ func makeZip(targ, workdir string) error {
defer r.Close() defer r.Close()
_, err = io.Copy(w, r) _, err = io.Copy(w, r)
return err return err
})) })
if err != nil {
return err
}
if err := zw.Close(); err != nil { if err := zw.Close(); err != nil {
return err return err
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment