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

libwebm: handle (as error) cluster with unknown size

Browse Source 
Change-Id: I8342d50d0482d77cb895ae659568016eb48ed2be
This commit is contained in:
matthewjheaney
2011-02-10 13:32:40 -05:00
parent d931a6ecc6
commit 2c835bcc28
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mkvparser.cpp
View File

@@ -1511,6 +1511,11 @@ long Segment::LoadCluster(
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; //TODO: allow this
pos += len; //consume length of size of element pos += len; //consume length of size of element
const long long element_size = size + pos - idpos; const long long element_size = size + pos - idpos;
@@ -3361,7 +3366,10 @@ long Segment::ParseNext(
return result; return result;
if (result > 0) //no more clusters if (result > 0) //no more clusters
{
//pResult = &m_eos;
return 1; return 1;
}
pResult = GetLast(); pResult = GetLast();
return 0; //success return 0; //success
@@ -3607,7 +3615,10 @@ long Segment::ParseNext(
} }
if (off_next <= 0) //no next cluster found if (off_next <= 0) //no next cluster found
{
//pResult = &m_eos;
return 1; return 1;
}
//We have parsed the next cluster, and can even guarantee //We have parsed the next cluster, and can even guarantee
//that its payload is all available (via IMkvReader::Length). //that its payload is all available (via IMkvReader::Length).