* sbr/fmt_rfc2047.c (decode_rfc2047): Don't close the iconv descriptor if

  it isn't valid.

diff --git a/ChangeLog b/ChangeLog
index f593db9..0eaa651 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-09  Josh Bressers <josh@bress.net>
+
+       * sbr/fmt_rfc2047.c (decode_rfc2047): Don't close the iconv descriptor
+       if it isn't valid.
+
 2006-03-08  Josh Bressers <josh@bress.net>
 
        * (mh_strcasecmp): Rename the private strcasecmp function to

diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index ef1bdfa..9d5b6d3 100644 (file)
--- a/sbr/fmt_rfc2047.c
+++ b/sbr/fmt_rfc2047.c
@@ -200,7 +200,7 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen)
             * empty encoded text. This ensures that we don't
             * malloc 0 bytes but skip on to the end
             */
-           if (endofmime == startofmime) {
+           if (endofmime == startofmime && use_iconv) {
                use_iconv = 0;
                iconv_close(cd);
             }