666a4ba664
* Potential security problems caused by maliciously-formed RFC 2231 attachment parameters Several other bugs fixed as well. All users of Pine are highly encouraged to upgrade. Improvements to the port: * DOCSDIR'ification of plist * Patches regenerated to remove fuzz Approved by: security-officer, portmgr
70 lines
2.3 KiB
Text
70 lines
2.3 KiB
Text
*** pine/send.c.orig Fri Aug 29 15:03:08 2003
|
|
--- pine/send.c Fri Sep 5 01:44:20 2003
|
|
***************
|
|
*** 8251,8263 ****
|
|
body->subtype = cpystr("octet-stream");
|
|
}
|
|
|
|
! /*
|
|
! * Apply maximal encoding regardless of previous
|
|
! * setting. This segment's either not text, or is
|
|
! * unlikely to be readable with > 30% of the
|
|
! * text encoded anyway, so we might as well save space...
|
|
! */
|
|
! new_encoding = ENCBINARY; /* > 30% 8 bit chars */
|
|
}
|
|
}
|
|
|
|
--- 8251,8267 ----
|
|
body->subtype = cpystr("octet-stream");
|
|
}
|
|
|
|
! if(body->type == TYPETEXT)
|
|
! /* Use ENC8BIT rather than ENCBINARY for TEXT */
|
|
! new_encoding = ENC8BIT;
|
|
! else
|
|
! /*
|
|
! * Apply maximal encoding regardless of previous
|
|
! * setting. This segment's either not text, or is
|
|
! * unlikely to be readable with > 30% of the
|
|
! * text encoded anyway, so we might as well save space...
|
|
! */
|
|
! new_encoding = ENCBINARY; /* > 30% 8 bit chars */
|
|
}
|
|
}
|
|
|
|
***************
|
|
*** 9278,9284 ****
|
|
|
|
switch (body->encoding) { /* all else needs filtering */
|
|
case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */
|
|
! gf_link_filter(gf_8bit_qp, NULL);
|
|
break;
|
|
|
|
case ENCBINARY: /* encode binary into BASE64 */
|
|
--- 9282,9289 ----
|
|
|
|
switch (body->encoding) { /* all else needs filtering */
|
|
case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */
|
|
! if(F_OFF(F_ENABLE_8BIT, ps_global)) /* unless 8BIT enabled */
|
|
! gf_link_filter(gf_8bit_qp, NULL);
|
|
break;
|
|
|
|
case ENCBINARY: /* encode binary into BASE64 */
|
|
***************
|
|
*** 9392,9398 ****
|
|
&& !(so_puts(so, "Content-Transfer-Encoding: ")
|
|
&& so_puts(so, body_encodings[(body->encoding==ENCBINARY)
|
|
? ENCBASE64
|
|
! : (body->encoding == ENC8BIT)
|
|
? ENCQUOTEDPRINTABLE
|
|
: (body->encoding <= ENCMAX)
|
|
? body->encoding
|
|
--- 9397,9403 ----
|
|
&& !(so_puts(so, "Content-Transfer-Encoding: ")
|
|
&& so_puts(so, body_encodings[(body->encoding==ENCBINARY)
|
|
? ENCBASE64
|
|
! : (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global))
|
|
? ENCQUOTEDPRINTABLE
|
|
: (body->encoding <= ENCMAX)
|
|
? body->encoding
|