generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am cd79c8b1: Merge "Fix a wchar.wcstombs_wcrtombs test failure."

Browse Source 
* commit 'cd79c8b1584237313ca6d14fbb0fb57be52a5394':
  Fix a wchar.wcstombs_wcrtombs test failure.
This commit is contained in:
Elliott Hughes 2014-04-18 21:52:35 +00:00 committed by Android Git Automerger
commit 30659d4ff0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/bionic/wchar.cpp
View File

@ -250,6 +250,9 @@ size_t wcsrtombs(char* dst, const wchar_t** src, size_t n, mbstate_t* /*ps*/) {
// TODO: UTF-8 support. // TODO: UTF-8 support.
if ((*src)[i] > 0x7f) { if ((*src)[i] > 0x7f) {
errno = EILSEQ; errno = EILSEQ;
if (dst != NULL) {
*src = &(*src)[i];
}
return static_cast<size_t>(-1); return static_cast<size_t>(-1);
} }
if (dst != NULL) { if (dst != NULL) {

4
tests/wchar_test.cpp
View File

@ -58,8 +58,8 @@ TEST(wchar, wctomb_wcrtomb) {
} }
TEST(wchar, wcstombs_wcrtombs) { TEST(wchar, wcstombs_wcrtombs) {
wchar_t chars[] = { L'h', L'e', L'l', L'l', L'o', 0 }; const wchar_t chars[] = { L'h', L'e', L'l', L'l', L'o', 0 };
wchar_t bad_chars[] = { L'h', L'i', 666, 0 }; const wchar_t bad_chars[] = { L'h', L'i', 666, 0 };
const wchar_t* src; const wchar_t* src;
char bytes[BUFSIZ]; char bytes[BUFSIZ];