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

Prevent the segment table of Ogg pages from exceeding the size limit.

Browse Source
This commit is contained in:
Tsuda Kageyu 2016-12-01 10:50:30 +09:00
parent 046c98230f
commit cfbaf34597
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
taglib/ogg/oggpage.cpp
View File

@ -208,15 +208,15 @@ List<Ogg::Page *> Ogg::Page::paginate(const ByteVectorList &packets,
static const unsigned int SplitSize = 32 * 255;
// Force repagination if the packets are too large for a page.
// Force repagination if the segment table will exceed the size limit.
if(strategy != Repaginate) {
size_t totalSize = packets.size();
size_t tableSize = 0;
for(ByteVectorList::ConstIterator it = packets.begin(); it != packets.end(); ++it)
totalSize += it->size();
tableSize += it->size() / 255 + 1;
if(totalSize > 255 * 255)
if(tableSize > 255)
strategy = Repaginate;
}

32
tests/test_ogg.cpp
View File

@ -42,7 +42,8 @@ class TestOGG : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(TestOGG);
CPPUNIT_TEST(testSimple);
CPPUNIT_TEST(testSplitPackets);
CPPUNIT_TEST(testSplitPackets1);
CPPUNIT_TEST(testSplitPackets2);
CPPUNIT_TEST(testDictInterface1);
CPPUNIT_TEST(testDictInterface2);
CPPUNIT_TEST(testAudioProperties);
@ -67,7 +68,7 @@ public:
}
}
void testSplitPackets()
void testSplitPackets1()
{
ScopedFileCopy copy("empty", ".ogg");
string newname = copy.fileName();
@ -110,6 +111,33 @@ public:
}
}
void testSplitPackets2()
{
ScopedFileCopy copy("empty", ".ogg");
string newname = copy.fileName();
const String text = longText(60890, true);
{
Vorbis::File f(newname.c_str());
f.tag()->setTitle(text);
f.save();
}
{
Vorbis::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL(text, f.tag()->title());
f.tag()->setTitle("ABCDE");
f.save();
}
{
Vorbis::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL(String("ABCDE"), f.tag()->title());
}
}
void testDictInterface1()
{
ScopedFileCopy copy("empty", ".ogg");