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

Correct checks for conversion success in wxUniChar.

Browse Source 
Correct the checks in wxUniChar::From/ToHi8bit() to check for conversion
success correctly as it always failed otherwise: wxMBConv::To/FromWChar()
conversion functions should return 2, not 1, when conversion of 2 characters
succeeded, even if one of them is a NUL.

Closes #11243.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-09-30 00:15:11 +00:00
parent 023f27388f
commit 7a8e90dd7a
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/unichar.cpp
View File

@@ -44,13 +44,16 @@ wxUniChar::value_type wxUniChar::FromHi8bit(char c)
return wxT('?'); // FIXME-UTF8: what to use as failure character? return wxT('?'); // FIXME-UTF8: what to use as failure character?
#else #else
wchar_t buf[2]; char cbuf[2];
if ( wxConvLibc.ToWChar(buf, 2, &c, 1) != 2 ) cbuf[0] = c;
cbuf[1] = '\0';
wchar_t wbuf[2];
if ( wxConvLibc.ToWChar(wbuf, 2, cbuf, 2) != 2 )
{ {
wxFAIL_MSG( "invalid multibyte character" ); wxFAIL_MSG( "invalid multibyte character" );
return wxT('?'); // FIXME-UTF8: what to use as failure character? return wxT('?'); // FIXME-UTF8: what to use as failure character?
} }
return buf[0]; return wbuf[0];
#endif #endif
} }
@@ -63,14 +66,16 @@ char wxUniChar::ToHi8bit(wxUniChar::value_type c)
return '?'; // FIXME-UTF8: what to use as failure character? return '?'; // FIXME-UTF8: what to use as failure character?
#else #else
wchar_t in = c; wchar_t wbuf[2];
char buf[2]; wbuf[0] = c;
if ( wxConvLibc.FromWChar(buf, 2, &in, 1) != 2 ) wbuf[1] = L'\0';
char cbuf[2];
if ( wxConvLibc.FromWChar(cbuf, 2, wbuf, 2) != 2 )
{ {
wxFAIL_MSG( "character cannot be converted to single byte" ); wxFAIL_MSG( "character cannot be converted to single byte" );
return '?'; // FIXME-UTF8: what to use as failure character? return '?'; // FIXME-UTF8: what to use as failure character?
} }
return buf[0]; return cbuf[0];
#endif #endif
} }