Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use io.ReadFull to read headers/indexes #33

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all 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
4 changes: 2 additions & 2 deletions header.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (b rpmIndex) ValueCount() int { return int(binary.BigEndian.Uint32(b[12:16]
func readHeader(r io.Reader, pad bool) (*Header, error) {
// decode the header structure header
var hdrBytes rpmHeader
if _, err := r.Read(hdrBytes[:]); err != nil {
if _, err := io.ReadFull(r, hdrBytes[:]); err != nil {
return nil, err
}
if hdrBytes.Size() > r_MaxHeaderSize {
Expand All @@ -64,7 +64,7 @@ func readHeader(r io.Reader, pad bool) (*Header, error) {
// decode the index
indexBytes := make([]rpmIndex, hdrBytes.IndexCount())
for i := 0; i < len(indexBytes); i++ {
if _, err := r.Read(indexBytes[i][:]); err != nil {
if _, err := io.ReadFull(r, indexBytes[i][:]); err != nil {
return nil, err
}
if indexBytes[i].Offset() >= hdrBytes.Size() {
Expand Down