Revert "safer and fail-faster reading of bogus frames"

.travis.yml

@@ -11,4 +11,4 @@ services:
 env:
  - AMQP_URL=amqp://guest:[email protected]:5672/ GOMAXPROCS=2
 
-script: go test -v -tags integration ./...
+script: go test -v -race -tags integration ./...

read.go

@@ -6,6 +6,7 @@
 package amqp
 
 import (
+	"bufio"
 	"bytes"
 	"encoding/binary"
 	"errors"
@@ -90,15 +91,35 @@ func (me *reader) ReadFrame() (frame frame, err error) {
 	return
 }
 
-func readShortstr(r io.Reader) (v string, err error) {
+func readN(r io.Reader, n int64) ([]byte, error) {
+	if n <= 1024*1024 {
+		if n < 0 {
+			return nil, bufio.ErrNegativeCount
+		}
+		b := make([]byte, n)
+		if _, err := io.ReadFull(r, b); err != nil {
+			return nil, err
+		}
+		return b, nil
+	}
+
+	buf := bytes.NewBuffer(nil)
+	br := bufio.NewReaderSize(r, 64*1024)
+	if _, err := io.CopyN(buf, br, n); err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+func readShortstr(r io.Reader) (string, error) {
 	var length uint8
-	if err = binary.Read(r, binary.BigEndian, &length); err != nil {
-		return
+	if err := binary.Read(r, binary.BigEndian, &length); err != nil {
+		return "", err
 	}
 
-	bytes := make([]byte, length)
-	if _, err = io.ReadFull(r, bytes); err != nil {
-		return
+	bytes, err := readN(r, int64(length))
+	if err != nil {
+		return "", err
 	}
 	return string(bytes), nil
 }
@@ -109,9 +130,9 @@ func readLongstr(r io.Reader) (v string, err error) {
 		return
 	}
 
-	bytes := make([]byte, length)
-	if _, err = io.ReadFull(r, bytes); err != nil {
-		return
+	bytes, err := readN(r, int64(length))
+	if err != nil {
+		return "", err
 	}
 	return string(bytes), nil
 }
@@ -241,8 +262,8 @@ func readField(r io.Reader) (v interface{}, err error) {
 			return nil, err
 		}
 
-		value := make([]byte, len)
-		if _, err = io.ReadFull(r, value); err != nil {
+		value, err := readN(r, int64(len))
+		if err != nil {
 			return nil, err
 		}
 		return value, err
@@ -420,15 +441,14 @@ func (me *reader) parseHeaderFrame(channel uint16, size uint32) (frame frame, er
 }
 
 func (me *reader) parseBodyFrame(channel uint16, size uint32) (frame frame, err error) {
+	body, err := readN(me.r, int64(size))
+	if err != nil {
+		return nil, err
+	}
 	bf := &bodyFrame{
 		ChannelId: channel,
-		Body:      make([]byte, size),
+		Body:      body,
 	}
-
-	if _, err = io.ReadFull(me.r, bf.Body); err != nil {
-		return nil, err
-	}
-
 	return bf, nil
 }
 

read_test.go

@@ -10,6 +10,7 @@ func TestGoFuzzCrashers(t *testing.T) {
 		"\b000000",
 		"\x02\x16\x10�[��\t\xbdui�" + "\x10\x01\x00\xff\xbf\xef\xbfｻn\x99\x00\x10r",
 		"\x0300\x00\x00\x00\x040000",
+		"\x020000000000000000000" + "0\x00\x00\x000!00000000000000" + "0000000000000000000x" + "\x800000000000000000000" + "00000000000000000000" + "00000000000000000000" + "00",
 	}
 
 	for idx, testStr := range testData {