Skip to content

Commit aec9bd4

Browse files
authored
Merge pull request #412 from wjohnson-aurora/master
Use io.ReadFull in roaring64.Bitmap.ReadFrom
2 parents 0d5af75 + 8c5bae9 commit aec9bd4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

roaring64/roaring64.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ func (rb *Bitmap) FromUnsafeBytes(data []byte) (p int64, err error) {
135135
func (rb *Bitmap) ReadFrom(stream io.Reader) (p int64, err error) {
136136
sizeBuf := make([]byte, 8)
137137
var n int
138-
n, err = stream.Read(sizeBuf)
139-
if n == 0 || err != nil {
138+
n, err = io.ReadFull(stream, sizeBuf)
139+
if err != nil {
140140
return int64(n), err
141141
}
142142
p += int64(n)
@@ -159,8 +159,8 @@ func (rb *Bitmap) ReadFrom(stream io.Reader) (p int64, err error) {
159159
}
160160
keyBuf := sizeBuf[:4]
161161
for i := uint64(0); i < size; i++ {
162-
n, err = stream.Read(keyBuf)
163-
if n == 0 || err != nil {
162+
n, err = io.ReadFull(stream, keyBuf)
163+
if err != nil {
164164
return int64(n), fmt.Errorf("error in bitmap.readFrom: could not read key #%d: %s", i, err)
165165
}
166166
p += int64(n)

0 commit comments

Comments
 (0)