[Nmh-commits] nmh ./ChangeLog sbr/fmt_rfc2047.c

[Oliver Kiddle]

CVSROOT:        /cvsroot/nmh
Module name:    nmh
Branch:         
Changes by:     Oliver Kiddle <address@hidden>  06/03/05 14:38:23

Modified files:
        .              : ChangeLog 
        sbr            : fmt_rfc2047.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/ChangeLog.diff?tr1=1.240&tr2=1.241&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/sbr/fmt_rfc2047.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: nmh/ChangeLog
diff -u nmh/ChangeLog:1.240 nmh/ChangeLog:1.241
--- nmh/ChangeLog:1.240 Sat Mar  4 22:14:18 2006
+++ nmh/ChangeLog       Sun Mar  5 14:38:23 2006
@@ -1,3 +1,8 @@
+2006-03-05  Oliver Kiddle <address@hidden>
+
+       * sbr/fmt_rfc2047.c: don't try to malloc 0 bytes if an RFC2047
+       encoded block is empty
+
 2006-03-04  Peter Maydell <address@hidden>
 
        * etc/Makefile.in: use INSTALL_SCRIPT to install scripts;
Index: nmh/sbr/fmt_rfc2047.c
diff -u nmh/sbr/fmt_rfc2047.c:1.5 nmh/sbr/fmt_rfc2047.c:1.6
--- nmh/sbr/fmt_rfc2047.c:1.5   Mon Jan  2 03:17:42 2006
+++ nmh/sbr/fmt_rfc2047.c       Sun Mar  5 14:38:23 2006
@@ -2,7 +2,7 @@
 /*
  * fmt_rfc2047.c -- decode RFC-2047 header format 
  *
- * $Id: fmt_rfc2047.c,v 1.5 2006/01/02 03:17:42 bress Exp $
+ * $Id: fmt_rfc2047.c,v 1.6 2006/03/05 14:38:23 opk Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -196,6 +196,13 @@
            }
 
 #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;