Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

Return values of Read not checked (fix #65) #299

Merged
merged 1 commit into from
Mar 3, 2017
Merged
Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions plumbing/format/idxfile/decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (d *Decoder) Decode(idx *Idxfile) error {

func validateHeader(r io.Reader) error {
var h = make([]byte, 4)
if _, err := r.Read(h); err != nil {
if _, err := io.ReadFull(r, h); err != nil {
return err
}

Expand Down Expand Up @@ -99,7 +99,7 @@ func readObjectNames(idx *Idxfile, r io.Reader) error {
c := int(idx.ObjectCount)
for i := 0; i < c; i++ {
var ref plumbing.Hash
if _, err := r.Read(ref[:]); err != nil {
if _, err := io.ReadFull(r, ref[:]); err != nil {
return err
}

Expand Down Expand Up @@ -135,11 +135,11 @@ func readOffsets(idx *Idxfile, r io.Reader) error {
}

func readChecksums(idx *Idxfile, r io.Reader) error {
if _, err := r.Read(idx.PackfileChecksum[:]); err != nil {
if _, err := io.ReadFull(r, idx.PackfileChecksum[:]); err != nil {
return err
}

if _, err := r.Read(idx.IdxChecksum[:]); err != nil {
if _, err := io.ReadFull(r, idx.IdxChecksum[:]); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion utils/binary/read.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func ReadUntil(r io.Reader, delim byte) ([]byte, error) {
var buf [1]byte
value := make([]byte, 0, 16)
for {
if _, err := r.Read(buf[:]); err != nil {
if _, err := io.ReadFull(r, buf[:]); err != nil {
if err == io.EOF {
return nil, err
}
Expand Down