From: Josh Bressers <josh@bress.net>
Date: Thu, 9 Mar 2006 19:51:13 +0000 (+0000)
Subject: * sbr/fmt_rfc2047.c (decode_rfc2047): Don't close the iconv descriptor if
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/1388183fc96a86e5fbbb9d43cebdedd9f44ab64f?ds=sidebyside

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

diff --git a/ChangeLog b/ChangeLog
index f593db93..0eaa6514 100644
--- 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 ef1bdfac..9d5b6d3c 100644
--- 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);
             }