Apply bug fix reported to Debian (#136976) by Peter Maydell; allows

messages with "Content-Transfer-Encoding: binary" to be
displayed, per RFC 2045 section 6.2 paragraph 4

diff --git a/uip/mhparse.c b/uip/mhparse.c
index a31bf94..79997fd 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -181,7 +181,7 @@ static struct str2init str2ces[] = {
     { "quoted-printable", CE_QUOTED,   InitQuoted },
     { "8bit",            CE_8BIT,      Init7Bit },
     { "7bit",            CE_7BIT,      Init7Bit },
-    { "binary",                  CE_BINARY,    NULL },
+    { "binary",                  CE_BINARY,    Init7Bit },
     { NULL,              CE_EXTENSION, NULL },  /* these two must be last! */
     { NULL,              CE_UNKNOWN,   NULL },
 };
@@ -988,6 +988,7 @@ InitMultiPart (CT ct)
      * Check for "boundary" parameter, which is
      * required for multipart messages.
      */
+    bp = 0;
     for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
        if (!strcasecmp (*ap, "boundary")) {
            bp = *ep;