don't try to malloc 0 bytes if an RFC2047 encoded block is empty

diff --git a/ChangeLog b/ChangeLog
index 84394783ee3ef52c3a554777c78648d0ddf15c1a..c6ea9069b05dfd09ebcfc4460f1425ecbc055797 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-05  Oliver Kiddle <okiddle@yahoo.co.uk>
+
+       * sbr/fmt_rfc2047.c: don't try to malloc 0 bytes if an RFC2047
+       encoded block is empty
+
 2006-03-04  Peter Maydell <pmaydell@chiark.greenend.org.uk>
 
        * etc/Makefile.in: use INSTALL_SCRIPT to install scripts;

diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index 0eb71bd64b47684cbd49fd1a60379354e5209b16..83ef21eb2c8ef89901386dc7d36231f797197d66 100644 (file)
--- 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;