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

Tweaks to preparing UTF-16 strings with BOM

Browse Source 
- '\xFF\xFE' and '\xFE\xFF' are valid, but empty, UTF-16 strings -- don't print a warning
 - print a warning on strings that don't start with a valid BOM

BUG:156076


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@764385 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
This commit is contained in:
Lukáš Lalinský 2008-01-21 16:40:07 +00:00
parent 49bcce586a
commit b8435c1ad5
3 changed files with 40 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

@ -677,7 +677,7 @@ void String::prepare(Type t)
switch(t) {
case UTF16:
{
if(d->data.size() > 1) {
if(d->data.size() >= 1 && (d->data[0] == 0xfeff || d->data[0] == 0xfffe)) {
bool swap = d->data[0] != 0xfeff;
d->data.erase(d->data.begin(), d->data.begin() + 1);
if(swap) {

17
tests/test_id3v2.cpp
View File

@ -10,6 +10,7 @@
#include <generalencapsulatedobjectframe.h>
#include <relativevolumeframe.h>
#include <urllinkframe.h>
#include "utils.h"
using namespace std;
using namespace TagLib;
@ -45,6 +46,7 @@ class TestID3v2 : public CppUnit::TestFixture
CPPUNIT_TEST(testRenderUrlLinkFrame);
CPPUNIT_TEST(testParseUserUrlLinkFrame);
CPPUNIT_TEST(testRenderUserUrlLinkFrame);
CPPUNIT_TEST(testSaveUTF16Comment);
CPPUNIT_TEST_SUITE_END();
public:
@ -243,6 +245,21 @@ public:
CPPUNIT_ASSERT_EQUAL(String("Sunshine Superman"), f.ID3v2Tag()->frameListMap()["TIT2"].front()->toString());
}
void testSaveUTF16Comment()
{
String::Type defaultEncoding = ID3v2::FrameFactory::instance()->defaultTextEncoding();
string newname = copyFile("xing", ".mp3");
ID3v2::FrameFactory::instance()->setDefaultTextEncoding(String::UTF16);
MPEG::File foo(newname.c_str());
foo.strip();
foo.tag()->setComment("Test comment!");
foo.save();
MPEG::File bar(newname.c_str());
CPPUNIT_ASSERT_EQUAL(String("Test comment!"), bar.tag()->comment());
deleteFile(newname);
ID3v2::FrameFactory::instance()->setDefaultTextEncoding(defaultEncoding);
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestID3v2);

22
tests/test_string.cpp
View File

@ -34,6 +34,8 @@ class TestString : public CppUnit::TestFixture
CPPUNIT_TEST(testString);
CPPUNIT_TEST(testUTF16Encode);
CPPUNIT_TEST(testUTF16Decode);
CPPUNIT_TEST(testUTF16DecodeInvalidBOM);
CPPUNIT_TEST(testUTF16DecodeEmptyWithBOM);
CPPUNIT_TEST_SUITE_END();
public:
@ -108,6 +110,26 @@ public:
CPPUNIT_ASSERT_EQUAL(a, String(d, String::UTF16));
}
// this test is expected to print "TagLib: String::prepare() -
// Invalid UTF16 string." on the console 3 times
void testUTF16DecodeInvalidBOM()
{
ByteVector b(" ", 1);
ByteVector c(" ", 2);
ByteVector d(" \0f\0o\0o", 8);
CPPUNIT_ASSERT_EQUAL(String(), String(b, String::UTF16));
CPPUNIT_ASSERT_EQUAL(String(), String(c, String::UTF16));
CPPUNIT_ASSERT_EQUAL(String(), String(d, String::UTF16));
}
void testUTF16DecodeEmptyWithBOM()
{
ByteVector a("\377\376", 2);
ByteVector b("\376\377", 2);
CPPUNIT_ASSERT_EQUAL(String(), String(a, String::UTF16));
CPPUNIT_ASSERT_EQUAL(String(), String(b, String::UTF16));
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestString);