mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-02-05 15:00:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #765 from TsudaKageyu/zero-length-atom

Browse Source 
Proper handling of MP4 atoms with zero length.
This commit is contained in:
Tsuda Kageyu
2016-11-08 21:12:47 +09:00
committed by GitHub
parent 1848b3bc6f f5ca097379
commit 253c61e37d
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
taglib/mp4/mp4atom.cpp
View File

@ -54,10 +54,15 @@ MP4::Atom::Atom(File *file)
length = header.toUInt();
if(length == 1) {
if(length == 0) {
// The last atom which extends to the end of the file.
length = file->length() - offset;
}
else if(length == 1) {
// The atom has a 64-bit length.
const long long longLength = file->readBlock(8).toLongLong();
if(longLength <= LONG_MAX) {
// The atom has a 64-bit length, but it's actually a 31-bit value or long is 64-bit.
// The actual length fits in long. That's always the case if long is 64-bit.
length = static_cast<long>(longLength);
}
else {
@ -67,6 +72,7 @@ MP4::Atom::Atom(File *file)
return;
}
}
if(length < 8) {
debug("MP4: Invalid atom size");
length = 0;