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

libwebm: handle unknown cluster size in Segment::Load too

Browse Source 
Change-Id: I7ed5feb7fe29cd413c8de35274138605725c5b38
This commit is contained in:
matthewjheaney
2011-02-10 14:41:54 -05:00
parent 2c835bcc28
commit a1736157be
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
mkvparser.cpp
View File

@@ -1769,17 +1769,33 @@ long Segment::Load()
assert(m_clusters == NULL); assert(m_clusters == NULL);
assert(m_clusterSize == 0); assert(m_clusterSize == 0);
assert(m_clusterCount == 0); assert(m_clusterCount == 0);
assert(m_size >= 0); //TODO: we now allow size < 0 //assert(m_size >= 0);
//Outermost (level 0) segment object has been constructed, //Outermost (level 0) segment object has been constructed,
//and pos designates start of payload. We need to find the //and pos designates start of payload. We need to find the
//inner (level 1) elements. //inner (level 1) elements.
const long long stop = m_start + m_size; long long total, avail;
while (m_pos < stop) const long status = m_pReader->Length(&total, &avail);
if (status < 0) //error
return status;
assert((total < 0) || (avail <= total));
const long long segment_stop = (m_size < 0) ? -1 : m_start + m_size;
for (;;)
{ {
long long pos = m_pos; long long pos = m_pos;
if ((total >= 0) && (pos >= total))
break;
if ((segment_stop >= 0) && (pos >= segment_stop))
break;
const long long element_start = pos; const long long element_start = pos;
long len; long len;
@@ -1789,7 +1805,7 @@ long Segment::Load()
if (result < 0) //error if (result < 0) //error
return static_cast<long>(result); return static_cast<long>(result);
if ((pos + len) > stop) if ((segment_stop >= 0) && ((pos + len) > segment_stop))
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
const long long idpos = pos; const long long idpos = pos;
@@ -1806,7 +1822,7 @@ long Segment::Load()
if (result < 0) //error if (result < 0) //error
return static_cast<long>(result); return static_cast<long>(result);
if ((pos + len) > stop) if ((segment_stop >= 0) && ((pos + len) > segment_stop))
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
const long long size = ReadUInt(m_pReader, pos, len); const long long size = ReadUInt(m_pReader, pos, len);
@@ -1814,13 +1830,18 @@ long Segment::Load()
if (size < 0) //error if (size < 0) //error
return static_cast<long>(size); return static_cast<long>(size);
const long long unknown_size = (1LL << (7 * len)) - 1;
if (size == unknown_size)
return E_FILE_FORMAT_INVALID;
pos += len; //consume length of size of element pos += len; //consume length of size of element
const long long element_size = size + pos - element_start; const long long element_size = size + pos - element_start;
//Pos now points to start of payload //Pos now points to start of payload
if ((pos + size) > stop) if ((segment_stop >= 0) && ((pos + size) > segment_stop))
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
if (id == 0x0F43B675) //Cluster ID if (id == 0x0F43B675) //Cluster ID
@@ -1876,8 +1897,6 @@ long Segment::Load()
m_pos = pos + size; //consume payload m_pos = pos + size; //consume payload
} }
assert(m_pos >= stop);
if (m_pInfo == NULL) if (m_pInfo == NULL)
return E_FILE_FORMAT_INVALID; //TODO: ignore this case? return E_FILE_FORMAT_INVALID; //TODO: ignore this case?
@@ -5494,6 +5513,10 @@ void Cluster::LoadBlockEntries() const
const long long size = ReadUInt(pReader, pos, len); const long long size = ReadUInt(pReader, pos, len);
assert(size > 0); assert(size > 0);
const long long unknown_size = (1LL << (7 * len)) - 1;
unknown_size;
assert(size != unknown_size);
pos += len; //consume size pos += len; //consume size
//pos now points to start of payload //pos now points to start of payload