Add failing test case for single-character header parsing.

[nmh] / uip / mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index a87778efcf7e4677a85b67317e140261d2205982..093c97767042c7d1251026c4e792fc5d28359af2 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -126,11 +126,12 @@ show_all_messages (CT *cts, int concatsw, int textonly, int inlineonly)
        ct = *ctp;
 
        /* if top-level type is ok, then display message */
-       if (type_ok (ct, 1))
+       if (type_ok (ct, 1)) {
            if (headersw) output_header(ct, hfmt);
 
            show_single_message (ct, formsw, concatsw, textonly, inlineonly,
                                 mfmt);
+       }
     }
 
     free_markercomps();
@@ -369,7 +370,7 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked, struct format *
                 return NOTOK;
         } else {
             char *charset = content_charset (ct);
-            admonish (NULL, "unable to convert character set%s%s to %s",
+            admonish (NULL, "unable to convert character set%s%s from %s",
                       ct->c_partno  ?  " of part "  :  "",
                       ct->c_partno  ?  ct->c_partno  :  "",
                       charset);
@@ -1265,20 +1266,22 @@ convert_content_charset (CT ct, char **file) {
     /* Using current locale, see if the content needs to be converted. */
 
     /* content_charset() cannot return NULL. */
-    char *charset = content_charset (ct);
+    char *src_charset = content_charset (ct);
 
-    if (! check_charset (charset, strlen (charset))) {
+    if (! check_charset (src_charset, strlen (src_charset))) {
         int unused = 0;
 
-        char *charset = getcpy (get_charset ());
+        char *dest_charset = getcpy (get_charset ());
 
-        if (convert_charset (ct, charset, &unused) == 0) {
+        if (convert_charset (ct, dest_charset, &unused) == 0) {
             *file = ct->c_cefile.ce_file;
         } else {
             status = NOTOK;
         }
+
+        free (dest_charset);
     }
-    free (charset);
+    free (src_charset);
 #else  /* ! HAVE_ICONV */
     NMH_UNUSED (ct);
     NMH_UNUSED (file);