code review 105820043: [release-branch.go1.3] compress/gzip: allow Reset on Re...

[release-branch.go1.3] compress/gzip: allow Reset on Reader without NewReader

««« CL 103020044 / 318b56ffe04b
compress/gzip: allow Reset on Reader without NewReader

Fixes issue 8126.

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://codereview.appspot.com/103020044
»»»

[dsymonds, 2014-06-04 01:17:22]

Hello rsc (cc: golang-codereviews@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go

[bradfitz, 2014-06-04 01:20:57]

LGTM
 On Jun 3, 2014 6:17 PM, <dsymonds@golang.org> wrote:

> Reviewers: rsc,
>
> Message:
> Hello rsc (cc: golang-codereviews@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> [release-branch.go1.3] compress/gzip: allow Reset on Reader without
> NewReader
>
> ««« CL 103020044 / 318b56ffe04b
> compress/gzip: allow Reset on Reader without NewReader
>
> Fixes issue 8126.
>
> LGTM=bradfitz
> R=golang-codereviews, bradfitz
> CC=golang-codereviews
> https://codereview.appspot.com/103020044
> »»»
>
>
> Please review this at https://codereview.appspot.com/105820043/
>
> Affected files (+19, -1 lines):
>   M src/pkg/compress/gzip/gunzip.go
>   M src/pkg/compress/gzip/gunzip_test.go
>
>
> Index: src/pkg/compress/gzip/gunzip.go
> ===================================================================
> --- a/src/pkg/compress/gzip/gunzip.go
> +++ b/src/pkg/compress/gzip/gunzip.go
> @@ -94,7 +94,11 @@
>  // This permits reusing a Reader rather than allocating a new one.
>  func (z *Reader) Reset(r io.Reader) error {
>         z.r = makeReader(r)
> -       z.digest.Reset()
> +       if z.digest == nil {
> +               z.digest = crc32.NewIEEE()
> +       } else {
> +               z.digest.Reset()
> +       }
>         z.size = 0
>         z.err = nil
>         return z.readHeader(true)
> Index: src/pkg/compress/gzip/gunzip_test.go
> ===================================================================
> --- a/src/pkg/compress/gzip/gunzip_test.go
> +++ b/src/pkg/compress/gzip/gunzip_test.go
> @@ -353,3 +353,17 @@
>                 // ok
>         }
>  }
> +
> +func TestInitialReset(t *testing.T) {
> +       var r Reader
> +       if err := r.Reset(bytes.NewReader(gunzipTests[1].gzip)); err !=
> nil {
> +               t.Error(err)
> +       }
> +       var buf bytes.Buffer
> +       if _, err := io.Copy(&buf, &r); err != nil {
> +               t.Error(err)
> +       }
> +       if s := buf.String(); s != gunzipTests[1].raw {
> +               t.Errorf("got %q want %q", s, gunzipTests[1].raw)
> +       }
> +}
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "golang-codereviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-codereviews+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

[dsymonds, 2014-06-04 01:21:16]

*** Submitted as https://code.google.com/p/go/source/detail?r=71651c3afd06 ***

[release-branch.go1.3] compress/gzip: allow Reset on Reader without NewReader

««« CL 103020044 / 318b56ffe04b
compress/gzip: allow Reset on Reader without NewReader

Fixes issue 8126.

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://codereview.appspot.com/103020044
»»»

TBR=rsc
R=rsc
CC=golang-codereviews
https://codereview.appspot.com/105820043

[rsc, 2014-06-04 01:21:57]

LGTM

[gobot, 2014-06-04 01:31:13]

This CL appears to have broken the openbsd-386-rootbsd builder.
See http://build.golang.org/log/cd0fbed08518b7d281aa118d28d5d5869f015b7f