diff options
| author | Michael Fraenkel <michael.fraenkel@gmail.com> | 2016-10-05 11:27:34 -0400 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-10-05 16:35:03 +0000 |
| commit | 7478ea5dba7ed02ddffd91c1d17ec8141f7cf184 (patch) | |
| tree | 55c20d832a9546fbd61d685b481dbc5f8be95e47 /src | |
| parent | f69991c17d9dea88e927643e4b7fdc43ad789ac3 (diff) | |
| download | go-7478ea5dba7ed02ddffd91c1d17ec8141f7cf184.tar.xz | |
net/http: multipart ReadForm close file after copy
Always close the file regardless of whether the copy succeeds or fails.
Pass along the close error if the copy succeeds
Fixes #16296
Change-Id: Ib394655b91d25750f029f17b3846d985f673fb50
Reviewed-on: https://go-review.googlesource.com/30410
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mime/multipart/formdata.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mime/multipart/formdata.go b/src/mime/multipart/formdata.go index 8085bd3975..c9e3188c33 100644 --- a/src/mime/multipart/formdata.go +++ b/src/mime/multipart/formdata.go @@ -79,8 +79,10 @@ func (r *Reader) readForm(maxMemory int64) (_ *Form, err error) { if err != nil { return nil, err } - defer file.Close() _, err = io.Copy(file, io.MultiReader(&b, p)) + if cerr := file.Close(); err == nil { + err = cerr + } if err != nil { os.Remove(file.Name()) return nil, err |