AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

detect some invalid UTF7 strings when decoding them in wxMBConvUTF7

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-03-31 20:04:07 +00:00
parent b0441359ca
commit 04a378342d
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/strconv.cpp
View File

@ -408,7 +408,7 @@ size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
size_t len = 0;
while (*psz && ((!buf) || (len < n)))
while ( *psz && (!buf || (len < n)) )
{
unsigned char cc = *psz++;
if (cc != '+')
@ -426,20 +426,19 @@ size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
len++;
psz++;
}
else
else // start of BASE64 encoded string
{
// BASE64 encoded string
bool lsb;
unsigned char c;
bool lsb, ok;
unsigned int d, l;
for (lsb = false, d = 0, l = 0;
(cc = utf7unb64[(unsigned char)*psz]) != 0xff; psz++)
for ( ok = lsb = false, d = 0, l = 0;
(cc = utf7unb64[(unsigned char)*psz]) != 0xff;
psz++ )
{
d <<= 6;
d += cc;
for (l += 6; l >= 8; lsb = !lsb)
{
c = (unsigned char)((d >> (l -= 8)) % 256);
unsigned char c = (unsigned char)((d >> (l -= 8)) % 256);
if (lsb)
{
if (buf)
@ -447,16 +446,29 @@ size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
len ++;
}
else
{
if (buf)
*buf = (wchar_t)(c << 8);
}
ok = true;
}
}
if ( !ok )
{
// in valid UTF7 we should have valid characters after '+'
return (size_t)-1;
}
if (*psz == '-')
psz++;
}
}
if (buf && (len < n))
*buf = 0;
if ( buf && (len < n) )
*buf = '\0';
return len;
}