code review 6811080: archive/zip: Fix bounds check panic for ZIP files with ...

archive/zip: Fix bounds check panic for ZIP files with a truncated extra header.

[davemc, 2012-11-07 02:35:51]

Hello golang-dev@googlegroups.com (cc: golang-dev@googlegroups.com), I'd like you to review this change to https://code.google.com/p/go

[gobot, 2012-11-07 03:20:02]

R=adg (assigned by dsymonds)

[dave_cheney.net, 2012-11-07 03:52:13]

On 2012/11/07 03:20:02, gobot wrote: > R=adg (assigned by dsymonds) Very nice, thank you for fixing this.

[adg, 2012-11-07 09:30:26]

https://codereview.appspot.com/6811080/diff/3003/src/pkg/archive/zip/zip_test.go File src/pkg/archive/zip/zip_test.go (right): https://codereview.appspot.com/6811080/diff/3003/src/pkg/archive/zip/zip_test... src/pkg/archive/zip/zip_test.go:193: if _, err = NewReader(bytes.NewReader(b), int64(len(b))); err == nil { err != ErrFormat https://codereview.appspot.com/6811080/diff/3003/src/pkg/archive/zip/zip_test... src/pkg/archive/zip/zip_test.go:194: t.Fatal("expected ErrFormat") t.Fatalf("got %v, expected ErrFormat", err)

[davemc, 2012-11-08 00:20:24]

Hello adg@golang.org, dave@cheney.net (cc: gobot@golang.org, golang-dev@googlegroups.com), Please take another look.

[davemc, 2012-11-08 00:21:00]

https://codereview.appspot.com/6811080/diff/3003/src/pkg/archive/zip/zip_test.go File src/pkg/archive/zip/zip_test.go (right): https://codereview.appspot.com/6811080/diff/3003/src/pkg/archive/zip/zip_test... src/pkg/archive/zip/zip_test.go:193: if _, err = NewReader(bytes.NewReader(b), int64(len(b))); err == nil { On 2012/11/07 09:30:26, adg wrote: > err != ErrFormat Done. https://codereview.appspot.com/6811080/diff/3003/src/pkg/archive/zip/zip_test... src/pkg/archive/zip/zip_test.go:194: t.Fatal("expected ErrFormat") On 2012/11/07 09:30:26, adg wrote: > t.Fatalf("got %v, expected ErrFormat", err) Done.

[adg, 2012-11-08 08:53:32]

LGTM

[adg, 2012-11-12 11:21:04]

*** Submitted as http://code.google.com/p/go/source/detail?r=f5c69f87ef34 *** archive/zip: Fix bounds check panic for ZIP files with a truncated extra header. R=adg, dave CC=gobot, golang-dev http://codereview.appspot.com/6811080 Committer: Andrew Gerrand <adg@golang.org>