diff options
Diffstat (limited to 'wcsmbs/wcsrtombs.c')
| -rw-r--r-- | wcsmbs/wcsrtombs.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c index 35bb58e977..904a003840 100644 --- a/wcsmbs/wcsrtombs.c +++ b/wcsmbs/wcsrtombs.c @@ -55,7 +55,7 @@ __wcsrtombs (dst, src, len, ps) if (dst == NULL) { char buf[256]; /* Just an arbitrary value. */ - size_t inbytes_in = __wcslen (*src) + 1; + size_t inbytes_in = (__wcslen (*src) + 1) * sizeof (wchar_t); size_t inbytes = inbytes_in; const wchar_t *inbuf = *src; size_t written; @@ -78,7 +78,8 @@ __wcsrtombs (dst, src, len, ps) } while (status == GCONV_FULL_OUTPUT); - if (status == GCONV_OK && dst[data.outbufavail - 1] == '\0') + if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT) + && buf[data.outbufavail - 1] == '\0') /* Don't count the NUL character in. */ --result; } @@ -87,7 +88,8 @@ __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. */ - size_t inbytes_in = __wcsnlen (*src, len * MB_CUR_MAX) + 1; + size_t inbytes_in = ((__wcsnlen (*src, len * MB_CUR_MAX) + 1) + * sizeof (wchar_t)); size_t inbytes = inbytes_in; data.outbuf = dst; @@ -100,7 +102,9 @@ __wcsrtombs (dst, src, len, ps) /* We have to determine whether the last character converted is the NUL character. */ - if (status == GCONV_OK && dst[data.outbufavail - 1] == '\0') + if ((status == GCONV_OK || status == GCONV_EMPTY_INPUT + || status == GCONV_FULL_OUTPUT) + && dst[data.outbufavail - 1] == '\0') { assert (data.outbufavail > 0); assert (mbsinit (data.statep)); @@ -113,10 +117,12 @@ __wcsrtombs (dst, src, len, ps) /* There must not be any problems with the conversion but illegal input characters. */ - assert (status == GCONV_OK || status == GCONV_ILLEGAL_INPUT + assert (status == GCONV_OK || status == GCONV_EMPTY_INPUT + || status == GCONV_ILLEGAL_INPUT || status == GCONV_INCOMPLETE_INPUT || status == GCONV_FULL_OUTPUT); - if (status != GCONV_OK && status != GCONV_FULL_OUTPUT) + if (status != GCONV_OK && status != GCONV_FULL_OUTPUT + && status != GCONV_EMPTY_INPUT) { result = (size_t) -1; __set_errno (EILSEQ); |