From: Edmund GRIMLEY EVANS <edmundo@rano.org>
Date: Sun, 8 Feb 2004 11:41:31 +0000 (+0000)
Subject: Fix a CP1255/8-related problem that's caused by a glibc/iconv bug.
X-Git-Tag: mutt-1-5-15-rel~215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f56520f503565f07487dc3c9c9d3027e0a8c4b3;p=mutt

Fix a CP1255/8-related problem that's caused by a glibc/iconv bug.
---

diff --git a/charset.c b/charset.c
index 19c3a2b5..18e9cdc5 100644
--- a/charset.c
+++ b/charset.c
@@ -379,18 +379,24 @@ size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t *inbytesleft,
 	if (*t)
 	  continue;
       }
-      if (outrepl)
+      /* Replace the output */
+      if (!outrepl)
+	outrepl = "?";
+      iconv (cd, 0, 0, &ob, &obl);
+      if (obl)
       {
-	/* Try replacing the output */
 	int n = strlen (outrepl);
-	if (n <= obl)
+	if (n > obl)
 	{
-	  memcpy (ob, outrepl, n);
-	  ++ib, --ibl;
-	  ob += n, obl -= n;
-	  ++ret;
-	  continue;
+	  outrepl = "?";
+	  n = 1;
 	}
+	memcpy (ob, outrepl, n);
+	++ib, --ibl;
+	ob += n, obl -= n;
+	++ret;
+	iconv (cd, 0, 0, 0, 0); /* for good measure */
+	continue;
       }
     }
     *inbuf = ib, *inbytesleft = ibl;