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

Commit 047a795

Browse files
authored
Merge pull request #299 from ajnavarro/fix/read-all
Return values of Read not checked (fix #65)
2 parents 59335b6 + 5bf5117 commit 047a795

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

plumbing/format/idxfile/decoder.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (d *Decoder) Decode(idx *Idxfile) error {
5757

5858
func validateHeader(r io.Reader) error {
5959
var h = make([]byte, 4)
60-
if _, err := r.Read(h); err != nil {
60+
if _, err := io.ReadFull(r, h); err != nil {
6161
return err
6262
}
6363

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

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

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

142-
if _, err := r.Read(idx.IdxChecksum[:]); err != nil {
142+
if _, err := io.ReadFull(r, idx.IdxChecksum[:]); err != nil {
143143
return err
144144
}
145145

utils/binary/read.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func ReadUntil(r io.Reader, delim byte) ([]byte, error) {
2727
var buf [1]byte
2828
value := make([]byte, 0, 16)
2929
for {
30-
if _, err := r.Read(buf[:]); err != nil {
30+
if _, err := io.ReadFull(r, buf[:]); err != nil {
3131
if err == io.EOF {
3232
return nil, err
3333
}

0 commit comments

Comments
 (0)