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

Merge remote-tracking branch 'TsudaKageyu/64bit-atom'

Browse Source 
Conflicts:
	ConfigureChecks.cmake
This commit is contained in:
Lukáš Lalinský
2014-12-08 16:52:33 -08:00
parent fb1c744daf 0731bc7b2e
commit 735e17f504
2 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
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,20 +54,25 @@ 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) {
// The atom has a 64-bit length, but it's actually a 32-bit value
length = (long)longLength;
if(sizeof(long) == sizeof(long long)) {
length = longLength;
}
else {
if(longLength <= 0xFFFFFFFF) {
// The atom has a 64-bit length, but it's actually a 32-bit value
length = (long)longLength;
}
else {
debug("MP4: 64-bit atoms are not supported");
length = 0;
file->seek(0, File::End);
return;
}
}
}
if (length < 8) {
if(length < 8) {
debug("MP4: Invalid atom size");
length = 0;
file->seek(0, File::End);