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

Workaround for 64-bit MP4 atoms.

Browse Source
This commit is contained in:
Tsuda Kageyu
2014-08-04 23:45:59 +09:00
parent b1a8205561
commit f29c5f45f8
3 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
taglib/mp4/mp4atom.cpp
View File

@ -23,6 +23,10 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <tdebug.h>
#include <tstring.h>
#include "mp4atom.h"
@ -50,9 +54,12 @@ MP4::Atom::Atom(File *file)
length = header.toUInt();
if (length == 1) {
if(length == 1) {
const long long longLength = file->readBlock(8).toLongLong();
if (longLength >= 8 && longLength <= 0xFFFFFFFF) {
#ifdef LONG_IS_INT64
length = longLength;
#else
if(longLength <= 0xFFFFFFFF) {
// The atom has a 64-bit length, but it's actually a 32-bit value
length = (long)longLength;
}
@ -62,8 +69,9 @@ MP4::Atom::Atom(File *file)
file->seek(0, File::End);
return;
}
#endif
}
if (length < 8) {
if(length < 8) {
debug("MP4: Invalid atom size");
length = 0;
file->seek(0, File::End);