Merge pull request #249 from jack15083/master

fix not enough buf error when decode date
apache · Dec 22, 2020 · 6c64125 · 6c64125
2 parents b07bde3 + 429fdc5
commit 6c64125
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/date.go b/date.go
@@ -80,7 +80,7 @@ func (d *Decoder) decDate(flag int32) (time.Time, error) {
 		return ZeroDate, nil
 	case tag == BC_DATE: //'d': //date
 		s = buf[:8]
-		l, err = d.next(s)
+		l, err = d.nextFull(s)
 		if err != nil {
 			return t, err
 		}
@@ -93,7 +93,7 @@ func (d *Decoder) decDate(flag int32) (time.Time, error) {
 
 	case tag == BC_DATE_MINUTE:
 		s = buf[:4]
-		l, err = d.next(s)
+		l, err = d.nextFull(s)
 		if err != nil {
 			return t, err
 		}

diff --git a/decode.go b/decode.go
@@ -129,6 +129,11 @@ func (d *Decoder) next(b []byte) (int, error) {
 	return d.reader.Read(b)
 }
 
+// read byte arr, and return the real length of b
+func (d *Decoder) nextFull(b []byte) (int, error) {
+	return io.ReadFull(d.reader, b)
+}
+
 // peek n bytes, will not advance the read ptr
 func (d *Decoder) peek(n int) []byte {
 	b, _ := d.reader.Peek(n)