X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2f689a1cb907a5de04e6d39ffd217a69af3216c7..78211e93:/sbr/fmt_rfc2047.c?ds=sidebyside

diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index 87fddb90..25c98c3d 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.
@@ -238,6 +236,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) {
@@ -304,8 +303,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)