From: Bruno Haible <bruno@clisp.org>
Date: Sun, 11 Mar 2001 16:00:59 +0000 (+0000)
Subject: Work around a bug in glibc-2.1 iconv.
X-Git-Tag: v0.10.36~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a1fb63b8fc1f5fbf4eca7d424e3e3b3e8cd2267;p=thirdparty%2Fgettext.git

Work around a bug in glibc-2.1 iconv.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7648b962d..de7bc491a 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-10  Bruno Haible  <haible@clisp.cons.org>
 
+	* linebreak.c (iconv_string_length): Don't call
+	iconv(cd,NULL,NULL,NULL,NULL) on glibc-2.1; it crashes.
+
 	* localcharset.c (locale_charset): Allow wildcard syntax. Resolve
 	alias also if codeset is empty.
 	* config.charset (BeOS): Use wildcard syntax.
diff --git a/lib/linebreak.c b/lib/linebreak.c
index bd15abf18..90879ac8a 100644
--- a/lib/linebreak.c
+++ b/lib/linebreak.c
@@ -1587,9 +1587,9 @@ iconv_string_length (cd, s, n)
       return (size_t)(-1);
     count += outptr - tmpbuf;
   }
-#endif
-  /* return to the initial state */
+  /* Return to the initial state.  */
   iconv (cd, NULL, NULL, NULL, NULL);
+#endif
   return count;
 #undef TMPBUFSIZE
 }