From 8c72ebb7e01640ea1916fa2637f20c0dab38e633 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 19 Jan 2010 21:14:53 +0000 Subject: [PATCH] * libc/stdlib/wcstombs_r.c (_wcstombs_r): Handle invalid characters correctly also in the s==NULL case. --- newlib/ChangeLog | 5 +++++ newlib/libc/stdlib/wcstombs_r.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index e47bb7bc6..281529b5c 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2010-01-19 Corinna Vinschen + + * libc/stdlib/wcstombs_r.c (_wcstombs_r): Handle invalid characters + correctly also in the s==NULL case. + 2010-01-17 Corinna Vinschen * libc/locale/locale.c (loadlocale): Change comments to refer to diff --git a/newlib/libc/stdlib/wcstombs_r.c b/newlib/libc/stdlib/wcstombs_r.c index 7017a10b1..e74502f46 100644 --- a/newlib/libc/stdlib/wcstombs_r.c +++ b/newlib/libc/stdlib/wcstombs_r.c @@ -13,20 +13,25 @@ _DEFUN (_wcstombs_r, (reent, s, pwcs, n, state), char *ptr = s; size_t max = n; char buff[8]; - int i, num_to_copy; + int i, bytes, num_to_copy; if (s == NULL) { size_t num_bytes = 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; } else { while (n > 0) { - int bytes = __wctomb (r, buff, *pwcs, __locale_charset (), state); + bytes = __wctomb (r, buff, *pwcs, __locale_charset (), state); if (bytes == -1) return -1; num_to_copy = (n > bytes ? bytes : (int)n);