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

mkvparser/Cluster: convert asserts to failure returns

Browse Source 
Change-Id: I264e68b24eeb0f719a9d60b4cb0454e38110dd39
This commit is contained in:
James Zern
2015-08-21 19:51:00 -07:00
parent 680b4bfd3d
commit c8960955db
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mkvparser.cpp
View File

@@ -5841,10 +5841,12 @@ long Cluster::Load(long long& pos, long& len) const {
} }
pos += size; // consume payload pos += size; // consume payload
assert((cluster_stop < 0) || (pos <= cluster_stop)); if (cluster_stop >= 0 && pos > cluster_stop)
return E_FILE_FORMAT_INVALID;
} }
assert((cluster_stop < 0) || (pos <= cluster_stop)); if (cluster_stop >= 0 && pos > cluster_stop)
return E_FILE_FORMAT_INVALID;
if (timecode < 0) // no timecode found if (timecode < 0) // no timecode found
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
@@ -6014,13 +6016,15 @@ long Cluster::Parse(long long& pos, long& len) const {
return this_->ParseSimpleBlock(size, pos, len); return this_->ParseSimpleBlock(size, pos, len);
pos += size; // consume payload pos += size; // consume payload
assert((cluster_stop < 0) || (pos <= cluster_stop)); if (cluster_stop >= 0 && pos > cluster_stop)
return E_FILE_FORMAT_INVALID;
} }
assert(m_element_size > 0); assert(m_element_size > 0);
m_pos = pos; m_pos = pos;
assert((cluster_stop < 0) || (m_pos <= cluster_stop)); if (cluster_stop >= 0 && m_pos > cluster_stop)
return E_FILE_FORMAT_INVALID;
if (m_entries_count > 0) { if (m_entries_count > 0) {
const long idx = m_entries_count - 1; const long idx = m_entries_count - 1;
@@ -6663,7 +6667,8 @@ long Cluster::HasBlockEntries(
return 1; // have at least one entry return 1; // have at least one entry
pos += size; // consume payload pos += size; // consume payload
assert((cluster_stop < 0) || (pos <= cluster_stop)); if (cluster_stop >= 0 && pos > cluster_stop)
return E_FILE_FORMAT_INVALID;
} }
} }
@@ -6846,12 +6851,14 @@ long Cluster::CreateBlockGroup(long long start_offset, long long size,
} }
pos += size; // consume payload pos += size; // consume payload
assert(pos <= stop); if (pos > stop)
return E_FILE_FORMAT_INVALID;
} }
if (bpos < 0) if (bpos < 0)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
assert(pos == stop); if (pos != stop)
return E_FILE_FORMAT_INVALID;
assert(bsize >= 0); assert(bsize >= 0);
const long idx = m_entries_count; const long idx = m_entries_count;