From d154cabfd09327ecb7eaca266882f0e580498d23 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Fri, 24 Jun 2022 15:58:48 +0300 Subject: [PATCH] Fix some bad errors in WARC reader --- warc/record.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/warc/record.go b/warc/record.go index d755ace..c5823fc 100644 --- a/warc/record.go +++ b/warc/record.go @@ -53,7 +53,7 @@ type SelfRecordReader struct { } func (srr *SelfRecordReader) Read(p []byte) (n int, err error) { - n, err = srr.rrr.Read(p) + n, err = srr.lr.Read(p) if err != nil { srr.Close() } @@ -73,7 +73,11 @@ func (rec *Record) selfReader(noHdr bool, offsets []Offset) (*SelfRecordReader, if err != nil { return nil, err } - return &SelfRecordReader{lr: &io.LimitedReader{R: rrr, N: rec.Size}, rrr: rrr}, nil + size := rec.Size + if !noHdr { + size += int64(rec.HdrLen) + } + return &SelfRecordReader{lr: &io.LimitedReader{R: rrr, N: size}, rrr: rrr}, nil } type RecordReader struct { -- 2.44.0