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

Fix bug with non-NUL-terminaed inputs in wxMBConvUTF8.

Browse Source 
We read beyond the provided maximal length as we didn't update the remaining
length while parsing the remaining bytes of an UTF-8-encoded code point.

Fix this and add a test for it.

Closes #15901.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-01-29 22:25:14 +00:00
parent 8d5a37c184
commit d94f3f5aba
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/strconv.cpp
View File

@@ -1272,6 +1272,14 @@ size_t wxMBConvUTF8::ToWChar(wchar_t *buf, size_t n,
wxUint32 res = cc & (0x3f >> cnt); wxUint32 res = cc & (0x3f >> cnt);
while (cnt--) while (cnt--)
{ {
if (!isNulTerminated && !srcLen)
{
// invalid UTF-8 sequence ending before the end of code
// point.
invalid = true;
break;
}
cc = *psz; cc = *psz;
if ((cc & 0xC0) != 0x80) if ((cc & 0xC0) != 0x80)
{ {
@@ -1281,6 +1289,8 @@ size_t wxMBConvUTF8::ToWChar(wchar_t *buf, size_t n,
} }
psz++; psz++;
if (!isNulTerminated)
srcLen--;
res = (res << 6) | (cc & 0x3f); res = (res << 6) | (cc & 0x3f);
} }

7
tests/strings/unicode.cpp
View File

@@ -352,6 +352,13 @@ void UnicodeTestCase::ConversionUTF8()
d.Test(n, conv); d.Test(n, conv);
d.Test(n, wxConvUTF8); d.Test(n, wxConvUTF8);
} }
static const char* const u25a6 = "\xe2\x96\xa6";
wxMBConvUTF8 c(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
CPPUNIT_ASSERT_EQUAL( 2, c.ToWChar(NULL, 0, u25a6, wxNO_LEN) );
CPPUNIT_ASSERT_EQUAL( 0, c.ToWChar(NULL, 0, u25a6, 0) );
CPPUNIT_ASSERT_EQUAL( 1, c.ToWChar(NULL, 0, u25a6, 3) );
CPPUNIT_ASSERT_EQUAL( 2, c.ToWChar(NULL, 0, u25a6, 4) );
} }
void UnicodeTestCase::ConversionUTF16() void UnicodeTestCase::ConversionUTF16()