Mercurial > vim
diff src/mbyte.c @ 4122:d5b1d6177b37 v7.3.814
updated for version 7.3.814
Problem: Can't input multibyte characters on Win32 console if 'encoding' is
different from current codepage.
Solution: Use convert_input_safe() instead of convert_input(). Make
string_convert_ext() return an error for incomplete input. (Ken
Takata)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 13 Feb 2013 16:49:58 +0100 |
| parents | 43c15135926f |
| children | ff193256398a |
line wrap: on
line diff
--- a/src/mbyte.c +++ b/src/mbyte.c @@ -6256,8 +6256,23 @@ string_convert_ext(vcp, ptr, lenp, uncon if (vcp->vc_cpfrom == 0) tmp_len = utf8_to_utf16(ptr, len, NULL, NULL); else - tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, 0, - ptr, len, 0, 0); + { + tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, + unconvlenp ? MB_ERR_INVALID_CHARS : 0, + ptr, len, 0, 0); + if (tmp_len == 0 + && GetLastError() == ERROR_NO_UNICODE_TRANSLATION) + { + if (lenp != NULL) + *lenp = 0; + if (unconvlenp != NULL) + *unconvlenp = len; + retval = alloc(1); + if (retval) + retval[0] = NUL; + return retval; + } + } tmp = (short_u *)alloc(sizeof(short_u) * tmp_len); if (tmp == NULL) break;