Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MultiByteToWideChar(CP_UTF7, MB_ERR_INVALID_CHARS, ...) fails, so don't use MB_ERR_INVALID_CHARS for UTF7 for now (even if it means that ill-formed UTF7 is not detected)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-01-31 01:13:04 +00:00
parent ec54fe9e18
commit 667e5b3e05
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/strconv.cpp
View File

@@ -403,7 +403,6 @@ static const unsigned char utf7unb64[] =
size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
size_t len = 0; size_t len = 0;
while (*psz && ((!buf) || (len < n))) while (*psz && ((!buf) || (len < n)))
@@ -493,8 +492,7 @@ static const unsigned char utf7encode[128] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 3 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 3
}; };
size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
*psz, size_t n) const
{ {
@@ -1477,10 +1475,20 @@ public:
// and break the library itself, e.g. wxTextInputStream::NextChar() // and break the library itself, e.g. wxTextInputStream::NextChar()
// wouldn't work if reading an incomplete MB char didn't result in an // wouldn't work if reading an incomplete MB char didn't result in an
// error // error
//
// note however that using MB_ERR_INVALID_CHARS with CP_UTF7 results in
// an error (tested under Windows Server 2003) and apparently it is
// done on purpose, i.e. the function accepts any input in this case
// and although I'd prefer to return error on ill-formed output, our
// own wxMBConvUTF7 doesn't detect errors (e.g. lone "+" which is
// explicitly ill-formed according to RFC 2152) neither so we don't
// even have any fallback here...
int flags = m_CodePage == CP_UTF7 ? 0 : MB_ERR_INVALID_CHARS;
const size_t len = ::MultiByteToWideChar const size_t len = ::MultiByteToWideChar
( (
m_CodePage, // code page m_CodePage, // code page
MB_ERR_INVALID_CHARS, // flags: fall on error flags, // flags: fall on error
psz, // input string psz, // input string
-1, // its length (NUL-terminated) -1, // its length (NUL-terminated)
buf, // output string buf, // output string