mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-03 00:58:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't underflow if there are no embedded frames

Browse Source 
Closes #513
This commit is contained in:
Scott Wheeler 2015-05-18 17:11:06 +02:00
parent 941efcba18
commit a094ce7dd2
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
taglib/mpeg/id3v2/frames/chapterframe.cpp
View File

@ -239,6 +239,11 @@ void ChapterFrame::parseFields(const ByteVector &data)
pos += 4;
size -= pos;
// Embedded frames are optional
if(size < header()->size())
return;
while((uint)embPos < size - header()->size()) {
Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), d->tagHeader);

28
tests/test_id3v2.cpp
View File

@ -907,17 +907,25 @@ public:
"\x00" // TIT2 frame text encoding
"CH1", 14); // Chapter title
ID3v2::ChapterFrame f(&header, chapterData + embeddedFrameData);
ID3v2::ChapterFrame f1(&header, chapterData);
CPPUNIT_ASSERT_EQUAL(ByteVector("\x43\x00", 2),
f.elementID());
CPPUNIT_ASSERT((uint)0x03 == f.startTime());
CPPUNIT_ASSERT((uint)0x05 == f.endTime());
CPPUNIT_ASSERT((uint)0x02 == f.startOffset());
CPPUNIT_ASSERT((uint)0x03 == f.endOffset());
CPPUNIT_ASSERT((uint)0x01 == f.embeddedFrameList().size());
CPPUNIT_ASSERT(f.embeddedFrameList("TIT2").size() == 1);
CPPUNIT_ASSERT(f.embeddedFrameList("TIT2")[0]->toString() == "CH1");
CPPUNIT_ASSERT_EQUAL(ByteVector("\x43\x00", 2), f1.elementID());
CPPUNIT_ASSERT((uint)0x03 == f1.startTime());
CPPUNIT_ASSERT((uint)0x05 == f1.endTime());
CPPUNIT_ASSERT((uint)0x02 == f1.startOffset());
CPPUNIT_ASSERT((uint)0x03 == f1.endOffset());
CPPUNIT_ASSERT((uint)0x00 == f1.embeddedFrameList().size());
ID3v2::ChapterFrame f2(&header, chapterData + embeddedFrameData);
CPPUNIT_ASSERT_EQUAL(ByteVector("\x43\x00", 2), f2.elementID());
CPPUNIT_ASSERT((uint)0x03 == f2.startTime());
CPPUNIT_ASSERT((uint)0x05 == f2.endTime());
CPPUNIT_ASSERT((uint)0x02 == f2.startOffset());
CPPUNIT_ASSERT((uint)0x03 == f2.endOffset());
CPPUNIT_ASSERT((uint)0x01 == f2.embeddedFrameList().size());
CPPUNIT_ASSERT(f2.embeddedFrameList("TIT2").size() == 1);
CPPUNIT_ASSERT(f2.embeddedFrameList("TIT2")[0]->toString() == "CH1");
}
void testRenderChapterFrame()