decoder: avoid problems with short reads

c1da7072 · Damian Gryski · 43c00601 · c1da7072
Commit c1da7072 authored Nov 24, 2013 by Damian Gryski
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

ogórek.go ogórek.go +6 -4

No files found.
--- a/ogórek.go
+++ b/ogórek.go
@@ -411,7 +411,10 @@ func (d *Decoder) loadBinString() error {
 func (d *Decoder) loadShortBinString() error {
 	b, _ := d.r.ReadByte()
 	s := make([]byte, b)
-	d.r.Read(s)
+	_, err := io.ReadFull(d.r, s)
+	if err != nil {
+		return err
+	}
 	d.push(string(s))
 	return nil
 }
@@ -586,9 +589,8 @@ func (d *Decoder) loadSetItems() error {
 }
 func (d *Decoder) binFloat() error {
-	f := make([]byte, 8)
+	var u uint64
-	d.r.Read(f)
+	binary.Read(d.r, binary.BigEndian, &u)
-	u := binary.BigEndian.Uint64(f)
 	d.stack = append(d.stack, math.Float64frombits(u))
 	return nil
 }