X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=06c67d947928122ec8e75f665a4e6f9b62d9df45;hb=fb1c27ed0cbc16d151d182dd3f2be5eb3189a045;hp=eb082c5d94b4f9bc0f798f8f0bf0c17e095d8a81;hpb=425d780e0e2cc08c58722145df4d3dd808f01d48;p=pspp

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index eb082c5d94..06c67d9479 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -137,6 +137,15 @@ recode_string_pool (const char *to, const char *from,
   if (from == NULL)
     from = default_encoding;
 
+  conv = create_iconv (to, from);
+
+  if ( (iconv_t) -1 == conv )
+    return xstrdup (text);
+
+  /* Put the converter into the initial shift state, in case there was any
+     state information left over from its last usage. */
+  iconv (conv, NULL, 0, NULL, 0);
+
   for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 )
     if ( outbufferlength > length)
       break;
@@ -148,11 +157,6 @@ recode_string_pool (const char *to, const char *from,
   inbytes = length;
 
 
-  conv = create_iconv (to, from);
-
-  if ( (iconv_t) -1 == conv )
-	return xstrdup (text);
-
   do {
     const char *ip = text;
     result = iconv (conv, (ICONV_CONST char **) &text, &inbytes,
@@ -176,6 +180,7 @@ recode_string_pool (const char *to, const char *from,
 	      }
 	    /* Fall through */
 	  case E2BIG:
+            iconv (conv, NULL, 0, NULL, 0);
 	    pool_free (pool, outbuf);
 	    outbufferlength <<= 1;
 	    outbuf = pool_malloc (pool, outbufferlength);