X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/7e669f1b5d51b1d562efd79ef04b8441574c0334..b4f2851d:/sbr/fmt_rfc2047.c?ds=sidebyside

diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index 83ef21eb..5e5a5a8e 100644
--- a/sbr/fmt_rfc2047.c
+++ b/sbr/fmt_rfc2047.c
@@ -2,8 +2,6 @@
 /*
  * fmt_rfc2047.c -- decode RFC-2047 header format 
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -13,7 +11,6 @@
 #include <h/utils.h>
 #ifdef HAVE_ICONV
 #  include <iconv.h>
-#  include <errno.h>
 #endif
 
 static signed char hexindex[] = {
@@ -63,7 +60,7 @@ int
 decode_rfc2047 (char *str, char *dst, size_t dstlen)
 {
     char *p, *q, *pp;
-    char *startofmime, *endofmime;
+    char *startofmime, *endofmime, *endofcharset;
     int c, quoted_printable;
     int encoding_found = 0;	/* did we decode anything?                */
     int between_encodings = 0;	/* are we between two encodings?          */
@@ -71,7 +68,7 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
     int whitespace = 0;		/* how much whitespace between encodings? */
 #ifdef HAVE_ICONV
     int use_iconv = 0;          /* are we converting encoding with iconv? */
-    iconv_t cd;
+    iconv_t cd = NULL;
     int fromutf8 = 0;
     char *saveq, *convbuf = NULL;
     size_t savedstlen;
@@ -129,11 +126,25 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
 	    if (!*pp)
 		continue;
 
+	    /*
+	     * RFC 2231 specifies that language information can appear
+	     * in a charset specification like so:
+	     *
+	     * =?us-ascii*en?Q?Foo?=
+	     *
+	     * Right now we don't use language information, so ignore it.
+	     */
+
+	    for (endofcharset = startofmime;
+	    		*endofcharset != '*' && endofcharset < pp;
+							endofcharset++)
+		;
+
 	    /* Check if character set can be handled natively */
-	    if (!check_charset(startofmime, pp - startofmime)) {
+	    if (!check_charset(startofmime, endofcharset - startofmime)) {
 #ifdef HAVE_ICONV
 	        /* .. it can't. We'll use iconv then. */
-		*pp = '\0';
+		*endofcharset = '\0';
 	        cd = iconv_open(get_charset(), startofmime);
 		fromutf8 = !strcasecmp(startofmime, "UTF-8");
 		*pp = '?';
@@ -200,8 +211,10 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
 	     * empty encoded text. This ensures that we don't
 	     * malloc 0 bytes but skip on to the end
 	     */
-	    if (endofmime == startofmime)
+	    if (endofmime == startofmime && use_iconv) {
 		use_iconv = 0;
+		iconv_close(cd);
+            }
 
 	    if (use_iconv) {
 		saveq = q;
@@ -236,6 +249,7 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
 	    } else {
 		/* base64 */
 		int c1, c2, c3, c4;
+		c1 = c2 = c3 = c4 = -1;
 
 		pp = startofmime;
 		while (pp < endofmime) {
@@ -302,8 +316,10 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
 			    break;
 			/* skip to next input character */
 			if (fromutf8) {
-			    for (start++;(start < q) && ((*start & 192) == 128);start++)
-			        inbytes--;
+			    for (++start, --inbytes;
+				 start < q  &&  (*start & 192) == 128;
+				 ++start, --inbytes)
+				continue;
 			} else
 			    start++, inbytes--;
 			if (start >= q)