[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[i18n 3/6] i18n: Ensure that every recoding starts from the initial shif
From: |
Ben Pfaff |
Subject: |
[i18n 3/6] i18n: Ensure that every recoding starts from the initial shift state. |
Date: |
Mon, 20 Sep 2010 22:50:23 -0700 |
---
src/libpspp/i18n.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 3735e95..06c67d9 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);
--
1.7.1
- [i18n 0/6] Fixes for recode_string()., Ben Pfaff, 2010/09/21
- [i18n 3/6] i18n: Ensure that every recoding starts from the initial shift state.,
Ben Pfaff <=
- [i18n 4/6] i18n: Properly restart conversion when output buffer overflows., Ben Pfaff, 2010/09/21
- [i18n 5/6] i18n: Refactor for simplicity., Ben Pfaff, 2010/09/21
- [i18n 1/6] i18n: Lightly reformat comments to better resemble other files., Ben Pfaff, 2010/09/21
- [i18n 6/6] i18n: Handle EINVAL more gracefully., Ben Pfaff, 2010/09/21
- [i18n 2/6] i18n: Avoid memory leak when create_iconv() fails., Ben Pfaff, 2010/09/21
- Re: [i18n 0/6] Fixes for recode_string()., John Darrington, 2010/09/21