* 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.
This commit is contained in:
Ulrich Drepper 2000-04-21 06:58:22 +00:00
parent 4a069c3345
commit 376b8b3de9
2 changed files with 5 additions and 2 deletions

View file

@ -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

View file

@ -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);