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

libwebm: defend against truncated stream

Browse Source 
Change-Id: I3fb983f9601ac133752fbbdb8bb8b179b18d14fb
This commit is contained in:
matthewjheaney
2011-03-08 12:25:26 -05:00
parent c226b79e61
commit ca1e6b7323
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mkvparser.cpp
View File

@@ -6332,7 +6332,9 @@ long Cluster::Parse(long long& pos, long& len) const
assert(m_element_size > 0); assert(m_element_size > 0);
#ifdef _DEBUG m_pos = pos;
assert((cluster_stop < 0) || (m_pos <= cluster_stop));
if (m_entries_count > 0) if (m_entries_count > 0)
{ {
const long idx = m_entries_count - 1; const long idx = m_entries_count - 1;
@@ -6344,7 +6346,9 @@ long Cluster::Parse(long long& pos, long& len) const
assert(pBlock); assert(pBlock);
const long long start = pBlock->m_start; const long long start = pBlock->m_start;
assert((total < 0) || (start <= total));
if ((total >= 0) && (start > total))
return -1; //defend against trucated stream
const long long size = pBlock->m_size; const long long size = pBlock->m_size;
@@ -6352,22 +6356,8 @@ long Cluster::Parse(long long& pos, long& len) const
assert((cluster_stop < 0) || (stop <= cluster_stop)); assert((cluster_stop < 0) || (stop <= cluster_stop));
if ((total >= 0) && (stop > total)) if ((total >= 0) && (stop > total))
{ return -1; //defend against trucated stream
#if 0
--m_entries_count;
assert(m_entries_count > 0); //TODO
m_entries[idx] = 0;
delete pLast;
#else
assert(false);
#endif
}
} }
#endif
m_pos = pos;
assert((cluster_stop < 0) || (m_pos <= cluster_stop));
return 1; //no more entries return 1; //no more entries
} }