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

am 447fe1c2: Merge "Fix mbsrtowcs(3) src param for finished string."

Browse Source 
* commit '447fe1c23bc5adaded9a51d3b58f3adaf2cce7b3':
  Fix mbsrtowcs(3) src param for finished string.
This commit is contained in:
Dan Albert
2014-07-31 22:28:59 +00:00
committed by Android Git Automerger
parent 0c4ad535dc 447fe1c23b
commit b782c20b82
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libc/bionic/wchar.cpp
View File

@@ -84,6 +84,7 @@ size_t mbsnrtowcs(wchar_t* dst, const char** src, size_t nmc, size_t len, mbstat
if (static_cast<uint8_t>((*src)[i]) < 0x80) {
// Fast path for plain ASCII characters.
if ((*src)[i] == '\0') {
*src = nullptr;
return reset_and_return(o, state);
}
r = 1;
@@ -96,6 +97,7 @@ size_t mbsnrtowcs(wchar_t* dst, const char** src, size_t nmc, size_t len, mbstat
return reset_and_return_illegal(EILSEQ, state);
}
if (r == 0) {
*src = nullptr;
return reset_and_return(o, state);
}
}
@@ -118,7 +120,8 @@ size_t mbsnrtowcs(wchar_t* dst, const char** src, size_t nmc, size_t len, mbstat
dst[o] = (*src)[i];
r = 1;
if ((*src)[i] == '\0') {
break;
*src = nullptr;
return reset_and_return(o, state);
}
} else {
r = mbrtowc(dst + o, *src + i, nmc - i, state);