X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffmt_rfc2047.c;h=83ef21eb2c8ef89901386dc7d36231f797197d66;hp=0eb71bd64b47684cbd49fd1a60379354e5209b16;hb=7e669f1b5d51b1d562efd79ef04b8441574c0334;hpb=206776d8154cbf7793282c984afab547bf05cbbc

diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index 0eb71bd..83ef21e 100644
--- a/sbr/fmt_rfc2047.c
+++ b/sbr/fmt_rfc2047.c
@@ -196,6 +196,13 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
 	    }
 
 #ifdef HAVE_ICONV
+	    /*
+	     * empty encoded text. This ensures that we don't
+	     * malloc 0 bytes but skip on to the end
+	     */
+	    if (endofmime == startofmime)
+		use_iconv = 0;
+
 	    if (use_iconv) {
 		saveq = q;
 		savedstlen = dstlen;