Changeset 3621:1116ed42fa23 for charset.c

Timestamp:

2004-02-08 03:41:31 (5 years ago)

Author:

Edmund GRIMLEY EVANS <edmundo@…>

Branch:

HEAD

Message:

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

Files:

• charset.c (modified) (1 diff)

charset.c

@@ -380 +380 @@
           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;
       }
     }