compress/lzw: return the partial decoding for a truncated input.

nigeltao · nigeltao · commit fea18f5a341e · 2015-06-30T03:47:06.000Z
This is needed by issue golang#9856. Change-Id: Idad570a7e55ad903aab55372d390bc746c4e19cf Reviewed-on: https://go-review.googlesource.com/11661 Reviewed-by: Rob Pike <r@golang.org>
diff --git a/src/compress/lzw/reader.go b/src/compress/lzw/reader.go
@@ -139,6 +139,7 @@ func (d *decoder) decode() {
 				err = io.ErrUnexpectedEOF
 			}
 			d.err = err
+			d.flush()
 			return
 		}
 		switch {
@@ -190,6 +191,7 @@ func (d *decoder) decode() {
 			}
 		default:
 			d.err = errors.New("lzw: invalid code")
+			d.flush()
 			return
 		}
 		d.last, d.hi = code, d.hi+1
diff --git a/src/compress/lzw/reader_test.go b/src/compress/lzw/reader_test.go
@@ -98,13 +98,20 @@ func TestReader(t *testing.T) {
 		defer rc.Close()
 		b.Reset()
 		n, err := io.Copy(&b, rc)
+		s := b.String()
 		if err != nil {
 			if err != tt.err {
 				t.Errorf("%s: io.Copy: %v want %v", tt.desc, err, tt.err)
 			}
+			if err == io.ErrUnexpectedEOF {
+				// Even if the input is truncated, we should still return the
+				// partial decoded result.
+				if n == 0 || !strings.HasPrefix(tt.raw, s) {
+					t.Errorf("got %d bytes (%q), want a non-empty prefix of %q", n, s, tt.raw)
+				}
+			}
 			continue
 		}
-		s := b.String()
 		if s != tt.raw {
 			t.Errorf("%s: got %d-byte %q want %d-byte %q", tt.desc, n, s, len(tt.raw), tt.raw)
 		}

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ func (d *decoder) decode() {`
`139`	`139`	`err = io.ErrUnexpectedEOF`
`140`	`140`	`}`
`141`	`141`	`d.err = err`
	`142`	`+ d.flush()`
`142`	`143`	`return`
`143`	`144`	`}`
`144`	`145`	`switch {`
`@@ -190,6 +191,7 @@ func (d *decoder) decode() {`
`190`	`191`	`}`
`191`	`192`	`default:`
`192`	`193`	`d.err = errors.New("lzw: invalid code")`
	`194`	`+ d.flush()`
`193`	`195`	`return`
`194`	`196`	`}`
`195`	`197`	`d.last, d.hi = code, d.hi+1`