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

really correct detecting the end of UTF-7-encoded strings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-18 00:47:21 +00:00
parent 36f9367822
commit ccaa848d6d
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/strconv.cpp
View File

@@ -565,7 +565,7 @@ static const unsigned char utf7unb64[] =
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
};
size_t wxMBConvUTF7::ToWChar(wchar_t *dst, size_t dstLen,
@@ -609,11 +609,19 @@ size_t wxMBConvUTF7::ToWChar(wchar_t *dst, size_t dstLen,
const unsigned char dc = utf7unb64[cc];
if ( dc == 0xff )
{
// end of encoded part, check that nothing was left: the bit
// field cycles through 0,6,4,2 sequence so check that we're at
// the end of it
if ( state.bit != 2 )
// end of encoded part, check that nothing was left: there can
// be up to 4 bits of 0 padding but nothing else (we also need
// to check isLSB as we count bits modulo 8 while a valid UTF-7
// encoded sequence must contain an integral number of UTF-16
// characters)
if ( state.isLSB || state.bit > 4 ||
(state.accum & ((1 << state.bit) - 1)) )
{
if ( !len )
state = stateOrig;
return wxCONV_FAILED;
}
state.ToDirect();
@@ -666,7 +674,15 @@ size_t wxMBConvUTF7::ToWChar(wchar_t *dst, size_t dstLen,
len++;
src++;
}
else
else if ( utf7unb64[(unsigned)*src] == 0xff )
{
// empty encoded chunks are not allowed
if ( !len )
state = stateOrig;
return wxCONV_FAILED;
}
else // base-64 encoded chunk follows
{
state.ToShifted();
}