Commit a8742efe authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

mime: limit bas64-encoded lines length to 76 characters

parent 2509395e

lib/mime.c

+2 −2
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static size_t encoder_base64_read(char *buffer, size_t size, bool ateof, 


  while(st->bufbeg < st->bufend) {

    /* Line full ? */

    if(st->pos >= MAX_ENCODED_LINE_LENGTH - 4) {

    if(st->pos > MAX_ENCODED_LINE_LENGTH - 4) {

      /* Yes, we need 2 characters for CRLF. */

      if(size < 2)

        break;
@@ -421,7 +421,7 @@ static size_t encoder_base64_read(char *buffer, size_t size, bool ateof, 
    if(size < 4 || st->bufend - st->bufbeg < 3)

      break;



    /* Encode three bytes a four characters. */

    /* Encode three bytes as four characters. */

    i = st->buf[st->bufbeg++] & 0xFF;

    i = (i << 8) | (st->buf[st->bufbeg++] & 0xFF);

    i = (i << 8) | (st->buf[st->bufbeg++] & 0xFF);

tests/data/test648

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ This is the e-mail inline text with a very long line containing the special= 
Content-Disposition: attachment; filename="test648.txt"

Content-Transfer-Encoding: base64



VGhpcyBpcyBhbiBhdHRhY2hlZCBmaWxlLgoKSXQgbWF5IGNvbnRhaW4gYW55IHR5cGUgb2Yg

ZGF0YSBhbmQgd2lsbCBiZSBlbmNvZGVkIGluIGJhc2U2NCBmb3IgdHJhbnNmZXIuCg==

VGhpcyBpcyBhbiBhdHRhY2hlZCBmaWxlLgoKSXQgbWF5IGNvbnRhaW4gYW55IHR5cGUgb2YgZGF0

YSBhbmQgd2lsbCBiZSBlbmNvZGVkIGluIGJhc2U2NCBmb3IgdHJhbnNmZXIuCg==

--------------------------------

.

</upload>