From: Ben Pfaff <blp@cs.stanford.edu>
Date: Tue, 21 Sep 2010 05:05:08 +0000 (-0700)
Subject: i18n: Ensure that every recoding starts from the initial shift state.
X-Git-Tag: sav-api~29
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=fb1c27ed0cbc16d151d182dd3f2be5eb3189a045

i18n: Ensure that every recoding starts from the initial shift state.
---

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 3735e95d84..06c67d9479 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -142,6 +142,10 @@ recode_string_pool (const char *to, const char *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;
@@ -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);