JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* libc/stdlib/wcstombs_r.c (_wcstombs_r): Handle invalid characters

Browse Source 
correctly also in the s==NULL case.
This commit is contained in:
Corinna Vinschen 2010-01-19 21:14:53 +00:00
parent 2a2b1437e7
commit 8c72ebb7e0
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2010-01-19 Corinna Vinschen <corinna@vinschen.de>
* libc/stdlib/wcstombs_r.c (_wcstombs_r): Handle invalid characters
correctly also in the s==NULL case.
2010-01-17 Corinna Vinschen <corinna@vinschen.de> 2010-01-17 Corinna Vinschen <corinna@vinschen.de>
* libc/locale/locale.c (loadlocale): Change comments to refer to * libc/locale/locale.c (loadlocale): Change comments to refer to

11
newlib/libc/stdlib/wcstombs_r.c
View File

@ -13,20 +13,25 @@ _DEFUN (_wcstombs_r, (reent, s, pwcs, n, state),
char *ptr = s; char *ptr = s;
size_t max = n; size_t max = n;
char buff[8]; char buff[8];
int i, num_to_copy; int i, bytes, num_to_copy;
if (s == NULL) if (s == NULL)
{ {
size_t num_bytes = 0; size_t num_bytes = 0;
while (*pwcs != 0) while (*pwcs != 0)
num_bytes += __wctomb (r, buff, *pwcs++, __locale_charset (), state); {
bytes = __wctomb (r, buff, *pwcs++, __locale_charset (), state);
if (bytes == -1)
return -1;
num_bytes += bytes;
}
return num_bytes; return num_bytes;
} }
else else
{ {
while (n > 0) while (n > 0)
{ {
int bytes = __wctomb (r, buff, *pwcs, __locale_charset (), state); bytes = __wctomb (r, buff, *pwcs, __locale_charset (), state);
if (bytes == -1) if (bytes == -1)
return -1; return -1;
num_to_copy = (n > bytes ? bytes : (int)n); num_to_copy = (n > bytes ? bytes : (int)n);