Skip to content
Permalink
Browse files
Fix narrow_to_wide_c (ANDROID)
* Ensure converted string is NUL terminated
* Restore logic to that used prior to 9e2a9b5
  • Loading branch information
Zeno- committed Mar 2, 2015
1 parent 773aa8c commit aefe80769bc515e0ddbfc734d41de396aca1259c
Showing 1 changed file with 5 additions and 3 deletions.
@@ -83,16 +83,18 @@ const wchar_t *narrow_to_wide_c(const char *mbs)
size_t mbl = strlen(mbs);
wchar_t *wcs = new wchar_t[mbl + 1];

for (size_t i = 0; i < mbl; i++) {
size_t i, dest_i = 0;
for (i = 0; i < mbl; i++) {
if (((unsigned char) mbs[i] > 31) &&
((unsigned char) mbs[i] < 127)) {
wcs[i] = wide_chars[(unsigned char) mbs[i] - 32];
wcs[dest_i++] = wide_chars[(unsigned char) mbs[i] - 32];
}
//handle newline
else if (mbs[i] == '\n') {
wcs[i] = L'\n';
wcs[dest_i++] = L'\n';
}
}
wcs[dest_i] = '\0';

return wcs;
}

0 comments on commit aefe807

Please sign in to comment.