diff options
| author |  Runxi Yu | 2026-03-05 20:55:17 +0800 |
|---|---|---|
| committer | Runxi Yu | 2026-03-05 20:55:17 +0800 |
| commit | 915fca6a9c2923a3bcf7a5a257e5832fab8cd432 (patch) | |
| tree | 1726c92257263033da5cadb4a570c97b68332ee7 /internal/compress | |
| parent | lint: Exclude compress/{flate,internal} (diff) | |
| signature | No signature | |
*: Fix lint wsl_v5
Diffstat (limited to 'internal/compress')
| -rw-r--r-- | internal/compress/zlib/reader.go | 1 | ||||
| -rw-r--r-- | internal/compress/zlib/reader_reset.go | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/internal/compress/zlib/reader.go b/internal/compress/zlib/reader.go index 75ef864c..a6497dec 100644 --- a/internal/compress/zlib/reader.go +++ b/internal/compress/zlib/reader.go @@ -132,6 +132,7 @@ func (z *Reader) Read(p []byte) (int, error) { // Finished file; check checksum. readN, err := io.ReadFull(z.r, z.scratch[0:4]) z.trailerRead += uint64(readN) + if err != nil { if errors.Is(err, io.EOF) { err = io.ErrUnexpectedEOF diff --git a/internal/compress/zlib/reader_reset.go b/internal/compress/zlib/reader_reset.go index 19f06cf0..32af0b49 100644 --- a/internal/compress/zlib/reader_reset.go +++ b/internal/compress/zlib/reader_reset.go @@ -30,6 +30,7 @@ func (z *Reader) reset(r io.Reader, dict []byte) error { // Read the header (RFC 1950 section 2.2.). readN, err := io.ReadFull(z.r, z.scratch[0:2]) z.headerRead += uint64(readN) + z.err = err if z.err != nil { if errors.Is(z.err, io.EOF) { @@ -49,6 +50,7 @@ func (z *Reader) reset(r io.Reader, dict []byte) error { haveDict := z.scratch[1]&0x20 != 0 if haveDict { readN, z.err = io.ReadFull(z.r, z.scratch[0:4]) + z.headerRead += uint64(readN) if z.err != nil { if errors.Is(z.err, io.EOF) { @@ -76,10 +78,12 @@ func (z *Reader) reset(r io.Reader, dict []byte) error { if z.err != nil { return z.err } + progress, ok := z.decompressor.(flate.InputProgress) if !ok { panic("zlib: pooled decompressor does not implement flate.InputProgress") } + z.progress = progress z.digest = adler32.New() @@ -92,10 +96,12 @@ func (z *Reader) reset(r io.Reader, dict []byte) error { } else { z.decompressor = flate.NewReader(z.r) } + progress, ok := z.decompressor.(flate.InputProgress) if !ok { panic("zlib: decompressor does not implement flate.InputProgress") } + z.progress = progress z.digest = adler32.New() |