1999-07-26  Ulrich Drepper  <drepper@cygnus.com>

	* wcsmbs/wcsrtombs.c (__wcsrtombs): When computing maximum number
	of wide characters to convert do it right and don't overestimate
	by multiplying with MB_CUR_MAX.
	Reported by Bruno Haible <haible@ilog.fr>.
This commit is contained in:
Ulrich Drepper 1999-07-26 16:42:39 +00:00
parent b18ac18e67
commit b8a423c2db
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,10 @@
1999-07-26 Ulrich Drepper <drepper@cygnus.com>
* wcsmbs/wcsrtombs.c (__wcsrtombs): When computing maximum number
of wide characters to convert do it right and don't overestimate
by multiplying with MB_CUR_MAX.
Reported by Bruno Haible <haible@ilog.fr>.
1999-07-26 Jakub Jelinek <jj@ultra.linux.jz>
* string/bits/string2.h (__strcpy_small): Avoid compile time warning.

View file

@ -94,7 +94,7 @@ __wcsrtombs (dst, src, len, ps)
/* This code is based on the safe assumption that all internal
multi-byte encodings use the NUL byte only to mark the end
of the string. */
const wchar_t *srcend = *src + __wcsnlen (*src, len * MB_CUR_MAX) + 1;
const wchar_t *srcend = *src + __wcsnlen (*src, len) + 1;
size_t dummy;
data.__outbuf = dst;