mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-08-14 06:17:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

MP4: limit atoms in nested containers (#1392)

Browse Source 
Nested MP4 containers did not enforce the atom count limit applied at
the root level. A small file with many child atoms could consume
disproportionate memory while building the atom tree.

Apply the per-level limit to container children and reject files that
exceed it.
This commit is contained in:
Acts1631
2026-08-03 17:46:53 +02:00
committed by GitHub
parent cb92e0aec4
commit c0f2a939b4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
taglib/mp4/mp4atom.cpp
+8 -2
View File
@@ -40,6 +40,7 @@ namespace {
"stbl", "minf", "moof", "traf", "trak",
"stsd", "stem"
};
constexpr int MAX_MP4_ATOM_COUNT_PER_LEVEL = 50000;
} // namespace
class MP4::Atom::AtomPrivate
@@ -116,6 +117,13 @@ MP4::Atom::Atom(File *file, int depth)
return;
}
while(file->tell() < d->offset + d->length) {
if(d->children.size() >= MAX_MP4_ATOM_COUNT_PER_LEVEL) {
debug("MP4: Maximum atom count exceeded");
d->children.clear();
d->length = 0;
file->seek(0, File::End);
return;
}
auto child = new MP4::Atom(file, depth + 1);
d->children.append(child);
if(child->d->length == 0)
@@ -223,8 +231,6 @@ public:
MP4::Atoms::Atoms(File *file) :
d(std::make_unique<AtomsPrivate>())
{
static constexpr int MAX_MP4_ATOM_COUNT_PER_LEVEL = 50000;
d->atoms.setAutoDelete(true);
file->seek(0, File::End);