mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't decode redundant UTF-8 sequences in Win32.

Browse Source 
Linux and OS X are working well and won't be affected.
This commit is contained in:
Tsuda Kageyu 2016-11-10 17:09:40 +09:00
parent 2651372291
commit 7b8d576bde
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
taglib/toolkit/tstring.cpp
View File

@ -88,7 +88,7 @@ namespace
#ifdef _WIN32
len = ::MultiByteToWideChar(
CP_UTF8, 0, src, static_cast<int>(srcLength), dst, static_cast<int>(dstLength));
CP_UTF8, MB_ERR_INVALID_CHARS, src, static_cast<int>(srcLength), dst, static_cast<int>(dstLength));
#else

9
tests/test_string.cpp
View File

@ -50,6 +50,7 @@ class TestString : public CppUnit::TestFixture
CPPUNIT_TEST(testEncodeNonLatin1);
CPPUNIT_TEST(testEncodeEmpty);
CPPUNIT_TEST(testIterator);
CPPUNIT_TEST(testRedundantUTF8);
CPPUNIT_TEST_SUITE_END();
public:
@ -321,6 +322,14 @@ public:
CPPUNIT_ASSERT_EQUAL(L'I', *it2);
}
void testRedundantUTF8()
{
CPPUNIT_ASSERT_EQUAL(String("/"), String(ByteVector("\x2F"), String::UTF8));
CPPUNIT_ASSERT(String(ByteVector("\xC0\xAF"), String::UTF8).isEmpty());
CPPUNIT_ASSERT(String(ByteVector("\xE0\x80\xAF"), String::UTF8).isEmpty());
CPPUNIT_ASSERT(String(ByteVector("\xF0\x80\x80\xAF"), String::UTF8).isEmpty());
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestString);