X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffmt_rfc2047.c;h=687ea5774913c079f72389e96dfd16ed7287a347;hp=0932e341863834273679beeb9b240705bc83e33a;hb=93fa896ceb5fbebe2f1f6e6e36419a13f8ffd99f;hpb=b78007de9802005825390bee71dfce2306b42519

diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index 0932e34..687ea57 100644
--- a/sbr/fmt_rfc2047.c
+++ b/sbr/fmt_rfc2047.c
@@ -318,8 +318,12 @@ 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--;
+							start++;
+							while ((start < q) && ((*start & 192) == 128)) {
+								start++;
 								inbytes--;
+							}
 						} else
 							start++, inbytes--;
 						if (start >= q)
@@ -337,7 +341,7 @@ decode_rfc2047(char *str, char *dst, size_t dstlen)
 				if (!dstlen || !savedstlen)
 					goto buffull;
 				dstlen = savedstlen;
-				free(convbuf);
+				mh_free0(&convbuf);
 			}
 #endif