formats/pktline: fixed underflow glitch reading network stream

mcuadros · mcuadros · commit ec1a57f40f78 · 2016-05-19T13:13:47.000+02:00
diff --git a/formats/pktline/decoder.go b/formats/pktline/decoder.go
@@ -48,10 +48,12 @@ func (d *Decoder) readLine() (string, error) {
 	}
 
 	line := make([]byte, exp)
-	if read, err := d.r.Read(line); err != nil {
+	if read, err := io.ReadFull(d.r, line); err != nil {
+		if err == io.ErrUnexpectedEOF && read < exp {
+			return "", ErrUnderflow
+		}
+
 		return "", err
-	} else if read != exp {
-		return "", ErrUnderflow
 	}
 
 	return string(line), nil

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,12 @@ func (d *Decoder) readLine() (string, error) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`line := make([]byte, exp)`
`51`		`- if read, err := d.r.Read(line); err != nil {`
	`51`	`+ if read, err := io.ReadFull(d.r, line); err != nil {`
	`52`	`+ if err == io.ErrUnexpectedEOF && read < exp {`
	`53`	`+ return "", ErrUnderflow`
	`54`	`+ }`
	`55`	`+`
`52`	`56`	`return "", err`
`53`		`- } else if read != exp {`
`54`		`- return "", ErrUnderflow`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`return string(line), nil`