generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes issues on Block Group parsing

Browse Source 
Changed assertions to "invalid file format" errors files that
had Block Groups without Block IDs or had invalid sizes or
durations

Change-Id: I1383a63bfb76ee46aaa0aff089780383ce65fc31
This commit is contained in:
Leonel Togniolli
2015-04-18 23:59:19 +01:00
committed by Tom Finegan
parent 5dd0e40dbd
commit d04580fda5
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mkvparser.cpp
View File

@@ -6440,12 +6440,16 @@ long Cluster::CreateBlockGroup(long long start_offset, long long size,
bsize = size; bsize = size;
} }
} else if (id == 0x1B) { // Duration ID } else if (id == 0x1B) { // Duration ID
assert(size <= 8); if (size > 8)
return E_FILE_FORMAT_INVALID;
duration = UnserializeUInt(pReader, pos, size); duration = UnserializeUInt(pReader, pos, size);
assert(duration >= 0); // TODO
if (duration < 0)
return E_FILE_FORMAT_INVALID;
} else if (id == 0x7B) { // ReferenceBlock } else if (id == 0x7B) { // ReferenceBlock
assert(size <= 8); if (size > 8 || size <= 0)
return E_FILE_FORMAT_INVALID;
const long size_ = static_cast<long>(size); const long size_ = static_cast<long>(size);
long long time; long long time;
@@ -6464,9 +6468,10 @@ long Cluster::CreateBlockGroup(long long start_offset, long long size,
pos += size; // consume payload pos += size; // consume payload
assert(pos <= stop); assert(pos <= stop);
} }
if (bpos < 0)
return E_FILE_FORMAT_INVALID;
assert(pos == stop); assert(pos == stop);
assert(bpos >= 0);
assert(bsize >= 0); assert(bsize >= 0);
const long idx = m_entries_count; const long idx = m_entries_count;