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

Merge "Fix mbsrtowcs(3)'s handling of len parameter." into lmp-dev

Browse Source
This commit is contained in:
Dan Albert 2014-07-29 22:42:11 +00:00 committed by Android (Google) Code Review
commit a1a813da81
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/bionic/wchar.cpp
View File

@ -116,11 +116,10 @@ size_t mbsnrtowcs(wchar_t* dst, const char** src, size_t nmc, size_t len, mbstat
if (static_cast<uint8_t>((*src)[i]) < 0x80) { if (static_cast<uint8_t>((*src)[i]) < 0x80) {
// Fast path for plain ASCII characters. // Fast path for plain ASCII characters.
dst[o] = (*src)[i]; dst[o] = (*src)[i];
if ((*src)[i] == '\0') {
*src = NULL;
return reset_and_return_illegal(EILSEQ, state);
}
r = 1; r = 1;
if ((*src)[i] == '\0') {
break;
}
} else { } else {
r = mbrtowc(dst + o, *src + i, nmc - i, state); r = mbrtowc(dst + o, *src + i, nmc - i, state);
if (r == __MB_ERR_ILLEGAL_SEQUENCE) { if (r == __MB_ERR_ILLEGAL_SEQUENCE) {

11
tests/wchar_test.cpp
View File

@ -340,8 +340,19 @@ void test_mbsrtowcs(mbstate_t* ps) {
ASSERT_EQ(static_cast<wchar_t>(0x00a2), out[1]); ASSERT_EQ(static_cast<wchar_t>(0x00a2), out[1]);
ASSERT_EQ(static_cast<wchar_t>(0x20ac), out[2]); ASSERT_EQ(static_cast<wchar_t>(0x20ac), out[2]);
ASSERT_EQ(static_cast<wchar_t>(0x24b62), out[3]); ASSERT_EQ(static_cast<wchar_t>(0x24b62), out[3]);
// Check that valid has advanced to the next unread character.
ASSERT_EQ('e', *valid); ASSERT_EQ('e', *valid);
wmemset(out, L'x', sizeof(out) / sizeof(wchar_t));
ASSERT_EQ(2U, mbsrtowcs(out, &valid, 4, ps));
ASSERT_EQ(L'e', out[0]);
ASSERT_EQ(L'f', out[1]);
ASSERT_EQ(L'\0', out[2]);
// Check that we didn't clobber the rest of out.
ASSERT_EQ(L'x', out[3]);
// Check that valid has advanced to the end of the string.
ASSERT_EQ(L'\0', *valid);
const char* invalid = "A" "\xc2\x20" "ef"; const char* invalid = "A" "\xc2\x20" "ef";
ASSERT_EQ(static_cast<size_t>(-1), mbsrtowcs(out, &invalid, 4, ps)); ASSERT_EQ(static_cast<size_t>(-1), mbsrtowcs(out, &invalid, 4, ps));
EXPECT_EQ(EILSEQ, errno); EXPECT_EQ(EILSEQ, errno);