Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions internal/archive/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,13 @@ func readBytes(readerSeeker io.ReadSeeker, index, size int64) ([]byte, error) {
}

buf := make([]byte, size)
_, err = readerSeeker.Read(buf)
n, err := readerSeeker.Read(buf)
if errors.Is(err, io.EOF) {
return buf[:n], io.EOF
}

if err != nil {
return nil, fmt.Errorf("readerSeeker.Read failed: %w", err)
return buf[:n], fmt.Errorf("readerSeeker.Read failed: %w", err)
}

return buf, nil
Expand Down
6 changes: 1 addition & 5 deletions internal/archive/tdf3_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ func (tdfReader TDFReader) Manifest() (string, error) {

// ReadPayload Return the payload of given length from index.
func (tdfReader TDFReader) ReadPayload(index, length int64) ([]byte, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest having this be ReadAt as well for consistency

buf, err := tdfReader.archiveReader.ReadFileData(TDFPayloadFileName, index, length)
if err != nil {
return nil, err
}
return buf, nil
return tdfReader.archiveReader.ReadFileData(TDFPayloadFileName, index, length)
}

// PayloadSize Return the size of the payload.
Expand Down
Loading