jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix incorrect range checks in wcsrtombs

Browse source 
negative values of wchar_t need to be treated in the non-ASCII case so
that they can properly generate EILSEQ rather than getting truncated
to 8bit values and stored in the output.
This commit is contained in:
Rich Felker 2013-04-04 14:48:48 -04:00
commit 40b2b5fa94
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/multibyte/wcsrtombs.c
View file

@ -18,7 +18,7 @@ size_t wcsrtombs(char *restrict s, const wchar_t **restrict ws, size_t n, mbstat
size_t N = n, l; size_t N = n, l;
if (!s) { if (!s) {
for (n=0, ws2=*ws; *ws2; ws2++) { for (n=0, ws2=*ws; *ws2; ws2++) {
if (*ws2 >= 0x80) { if (*ws2 >= 0x80u) {
l = wcrtomb(buf, *ws2, 0); l = wcrtomb(buf, *ws2, 0);
if (!(l+1)) return -1; if (!(l+1)) return -1;
n += l; n += l;
@ -27,7 +27,7 @@ size_t wcsrtombs(char *restrict s, const wchar_t **restrict ws, size_t n, mbstat
return n; return n;
} }
while (n>=4 && **ws) { while (n>=4 && **ws) {
if (**ws >= 0x80) { if (**ws >= 0x80u) {
l = wcrtomb(s, **ws, 0); l = wcrtomb(s, **ws, 0);
if (!(l+1)) return -1; if (!(l+1)) return -1;
s += l; s += l;
@ -39,7 +39,7 @@ size_t wcsrtombs(char *restrict s, const wchar_t **restrict ws, size_t n, mbstat
(*ws)++; (*ws)++;
} }
while (n && **ws) { while (n && **ws) {
if (**ws >= 0x80) { if (**ws >= 0x80u) {
l = wcrtomb(buf, **ws, 0); l = wcrtomb(buf, **ws, 0);
if (!(l+1)) return -1; if (!(l+1)) return -1;
if (l>n) return N-n; if (l>n) return N-n;