diff --git a/lib/rac/reader.go b/lib/rac/reader.go index d7a9efe0..0a3739c6 100644 --- a/lib/rac/reader.go +++ b/lib/rac/reader.go @@ -290,9 +290,10 @@ func (r *Reader) readImplicitZeroes(p []byte) (int, error) { // r.err "sticky error" field stays nil. func (r *Reader) nextChunk() error { chunk, err := r.parser.NextChunk() - if err == io.EOF { - return io.EOF - } else if err != nil { + if err != nil { + if err == io.EOF { + return io.EOF + } r.err = err return r.err } @@ -315,6 +316,9 @@ func (r *Reader) nextChunk() error { rctx, err := codecReader.MakeReaderContext(r.ReadSeeker, r.CompressedSize, chunk) if err != nil { + if err == io.EOF { + err = io.ErrUnexpectedEOF + } r.err = err return r.err } @@ -331,6 +335,9 @@ func (r *Reader) nextChunk() error { decompressor, err := codecReader.MakeDecompressor(&r.currChunk, rctx) if err != nil { + if err == io.EOF { + err = io.ErrUnexpectedEOF + } r.err = err return r.err } diff --git a/lib/raczlib/reader.go b/lib/raczlib/reader.go index 328a6453..46871e2f 100644 --- a/lib/raczlib/reader.go +++ b/lib/raczlib/reader.go @@ -75,9 +75,6 @@ func (r *CodecReader) MakeDecompressor( if r.cachedZlibReader != nil { if err := r.cachedZlibReader.Reset(compressed, rctx.Secondary); err != nil { - if err == io.EOF { - err = io.ErrUnexpectedEOF - } return nil, err } return r.cachedZlibReader.(io.Reader), nil @@ -85,9 +82,6 @@ func (r *CodecReader) MakeDecompressor( zlibReader, err := zlib.NewReaderDict(compressed, rctx.Secondary) if err != nil { - if err == io.EOF { - err = io.ErrUnexpectedEOF - } return nil, err } r.cachedZlibReader = zlibReader.(zlib.Resetter)