qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 08:50:22 -07:00
Code Releases Activity

archive/zip: return error from NewReader when negative size is passed

Browse Source 
Fixes #26589

Change-Id: I180883a13cec229093654004b42c48d76ee20272
GitHub-Last-Rev: 2d9879de43
GitHub-Pull-Request: golang/go#26667
Reviewed-on: https://go-review.googlesource.com/126617
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Joe Tsai <thebrokentoaster@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Jeet Parekh 2018-08-01 02:47:01 +00:00 committed by Joe Tsai
parent 0b30cf534a
commit 539ff607a7
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/archive/zip/reader.go
View File

@ -69,6 +69,9 @@ func OpenReader(name string) (*ReadCloser, error) {
// NewReader returns a new Reader reading from r, which is assumed to // NewReader returns a new Reader reading from r, which is assumed to
// have the given size in bytes. // have the given size in bytes.
func NewReader(r io.ReaderAt, size int64) (*Reader, error) { func NewReader(r io.ReaderAt, size int64) (*Reader, error) {
if size < 0 {
return nil, errors.New("zip: size cannot be negative")
}
zr := new(Reader) zr := new(Reader)
if err := zr.init(r, size); err != nil { if err := zr.init(r, size); err != nil {
return nil, err return nil, err

6
src/archive/zip/reader_test.go
View File

@ -658,6 +658,12 @@ func TestInvalidFiles(t *testing.T) {
if err != ErrFormat { if err != ErrFormat {
t.Errorf("sigs: error=%v, want %v", err, ErrFormat) t.Errorf("sigs: error=%v, want %v", err, ErrFormat)
} }
// negative size
_, err = NewReader(bytes.NewReader([]byte("foobar")), -1)
if err == nil {
t.Errorf("archive/zip.NewReader: expected error when negative size is passed")
}
} }
func messWith(fileName string, corrupter func(b []byte)) (r io.ReaderAt, size int64) { func messWith(fileName string, corrupter func(b []byte)) (r io.ReaderAt, size int64) {