Merge pull request #1524 from eelcocramer/bufio-fix

Fixes bufio buffer full error when reading from an array larger than 4096 bytes

internal/proto/reader.go

@@ -69,15 +69,29 @@ func (r *Reader) ReadLine() ([]byte, error) {
 //   - there is a pending read error;
 //   - or line does not end with \r\n.
 func (r *Reader) readLine() ([]byte, error) {
-	b, err := r.rd.ReadSlice('\n')
+	var s []byte
-	if err != nil {
+	multi := false
-		return nil, err
+	for {
+		b, err := r.rd.ReadSlice('\n')
+		if err != nil {
+			// in case the end of the buffer is not reached
+			if err == bufio.ErrBufferFull {
+				s = append(s, b...)
+				multi = true
+				continue
+			} else {
+				return nil, err
+			}
+		}
+		if len(b) <= 2 || b[len(b)-1] != '\n' || b[len(b)-2] != '\r' {
+			return nil, fmt.Errorf("redis: invalid reply: %q", b)
+		}
+		if multi {
+			b = append(s, b...)
+		}
+		b = b[:len(b)-2]
+		return b, nil
 	}
-	if len(b) <= 2 || b[len(b)-1] != '\n' || b[len(b)-2] != '\r' {
-		return nil, fmt.Errorf("redis: invalid reply: %q", b)
-	}
-	b = b[:len(b)-2]
-	return b, nil
 }
 
 func (r *Reader) ReadReply(m MultiBulkParse) (interface{}, error) {

internal/proto/reader_test.go

@@ -2,6 +2,7 @@ package proto_test
 
 import (
 	"bytes"
+	"io"
 	"testing"
 
 	"github.com/go-redis/redis/v8/internal/proto"
@@ -27,6 +28,21 @@ func BenchmarkReader_ParseReply_Slice(b *testing.B) {
 	benchmarkParseReply(b, "*2\r\n$5\r\nhello\r\n$5\r\nworld\r\n", multiBulkParse, false)
 }
 
+func TestReader_ReadLine(t *testing.T) {
+	original := bytes.Repeat([]byte("a"), 8192)
+	original[len(original)-2] = '\r'
+	original[len(original)-1] = '\n'
+	r := proto.NewReader(bytes.NewReader(original))
+	read, err := r.ReadLine()
+	if err != nil && err != io.EOF {
+		t.Errorf("Should be able to read the full buffer: %v", err)
+	}
+
+	if bytes.Compare(read, original[:len(original)-2]) != 0 {
+		t.Errorf("Values must be equal: %d expected %d", len(read), len(original[:len(original)-2]))
+	}
+}
+
 func benchmarkParseReply(b *testing.B, reply string, m proto.MultiBulkParse, wanterr bool) {
 	buf := new(bytes.Buffer)
 	for i := 0; i < b.N; i++ {