Merge pull request #4 from emersion/master

Disable lineLimitReader when handle BDAT data

conn.go

@@ -42,10 +42,11 @@ type Conn struct {
 	locker     sync.Mutex
 	binarymime bool
 
-	bdatPipe      *io.PipeWriter
-	bdatStatus    *statusCollector // used for BDAT on LMTP
-	dataResult    chan error
-	bytesReceived int // counts total size of chunks when BDAT is used
+	lineLimitReader *lineLimitReader
+	bdatPipe        *io.PipeWriter
+	bdatStatus      *statusCollector // used for BDAT on LMTP
+	dataResult      chan error
+	bytesReceived   int // counts total size of chunks when BDAT is used
 
 	fromReceived bool
 	recipients   []string
@@ -66,15 +67,16 @@ func newConn(c net.Conn, s *Server) *Conn {
 }
 
 func (c *Conn) init() {
+	c.lineLimitReader = &lineLimitReader{
+		R:         c.conn,
+		LineLimit: c.server.MaxLineLength,
+	}
 	rwc := struct {
 		io.Reader
 		io.Writer
 		io.Closer
 	}{
-		Reader: &lineLimitReader{
-			R:         c.conn,
-			LineLimit: c.server.MaxLineLength,
-		},
+		Reader: c.lineLimitReader,
 		Writer: c.conn,
 		Closer: c.conn,
 	}
@@ -859,6 +861,8 @@ func (c *Conn) handleBdat(arg string) {
 		}()
 	}
 
+	c.lineLimitReader.LineLimit = 0
+
 	chunk := io.LimitReader(c.text.R, int64(size))
 	_, err = io.Copy(c.bdatPipe, chunk)
 	if err != nil {
@@ -873,12 +877,15 @@ func (c *Conn) handleBdat(arg string) {
 		}
 
 		c.reset()
+		c.lineLimitReader.LineLimit = c.server.MaxLineLength
 		return
 	}
 
 	c.bytesReceived += int(size)
 
 	if last {
+		c.lineLimitReader.LineLimit = c.server.MaxLineLength
+
 		c.bdatPipe.Close()
 
 		err := <-c.dataResult

lengthlimit_reader.go

@@ -19,7 +19,7 @@ type lineLimitReader struct {
 }
 
 func (r *lineLimitReader) Read(b []byte) (int, error) {
-	if r.curLineLength > r.LineLimit {
+	if r.curLineLength > r.LineLimit && r.LineLimit > 0 {
 		return 0, ErrTooLongLine
 	}