Update.

	* wcsmbs/wcsrtombs.c (__wcsrtombs): If output buffer is too small
	don't search for NUL byte to decrement counter.
	Reported by Ulrich.Brink@sap.com.

diff --git a/ChangeLog b/ChangeLog
index 268c7ea9b101642577a0fd5db41724b3013a9336..a62bc297390f8e8c573419bdcc78f9049af38f89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-04-20  Ulrich Drepper  <drepper@redhat.com>
 
+       * wcsmbs/wcsrtombs.c (__wcsrtombs): If output buffer is too small
+       don't search for NUL byte to decrement counter.
+       Reported by Ulrich.Brink@sap.com.
+
        * iconv/gconv_simple.c: Define separate functions to convert from
        UCS4/UCS4-LE to the internal encoding.
        * iconv/gconv_builtin.h: Use separate functions to convert from

diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index cbb39d36e65288c75ad54399f0b9a83d99131d3e..28af214f18115ce1fe1127943d3505d9bd83edbe 100644 (file)
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -114,8 +114,7 @@ __wcsrtombs (dst, src, len, ps)
 
       /* We have to determine whether the last character converted
         is the NUL character.  */
-      if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT
-          || status == __GCONV_FULL_OUTPUT)
+      if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
          && data.__outbuf[-1] == '\0')
        {
          assert (data.__outbuf != (unsigned char *) dst);