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

LoadCluster: ensure avail before geting uint len

Browse Source 
Change-Id: I421501fcd9fdc017eee5307834911fbd18b510b0
This commit is contained in:
matthewjheaney
2011-01-13 23:30:47 -05:00
parent 00aa1804e9
commit 8081c58b9b
1 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
mkvparser.cpp
View File

@@ -1291,6 +1291,16 @@ long Segment::LoadCluster(
long long& pos, long long& pos,
long& len) long& len)
{ {
long long total, avail;
const int status = m_pReader->Length(&total, &avail);
if (status < 0) //error
return status;
assert(total >= 0);
assert(avail <= total);
const long long stop = m_start + m_size; const long long stop = m_start + m_size;
while (m_pos < stop) while (m_pos < stop)
@@ -1299,12 +1309,18 @@ long Segment::LoadCluster(
//Read ID //Read ID
if ((pos + 1) > avail)
{
len = 1;
return E_BUFFER_NOT_FULL;
}
long long result = GetUIntLength(m_pReader, pos, len); long long result = GetUIntLength(m_pReader, pos, len);
if (result < 0) //error if (result < 0) //error
return static_cast<long>(result); return static_cast<long>(result);
if (result > 0) if (result > 0) //weird
{ {
len = 1; len = 1;
return E_BUFFER_NOT_FULL; return E_BUFFER_NOT_FULL;
@@ -1313,6 +1329,9 @@ long Segment::LoadCluster(
if ((pos + len) > stop) if ((pos + len) > stop)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
if ((pos + len) > avail)
return E_BUFFER_NOT_FULL;
const long long idpos = pos; const long long idpos = pos;
const long long id = ReadUInt(m_pReader, idpos, len); const long long id = ReadUInt(m_pReader, idpos, len);
@@ -1323,12 +1342,18 @@ long Segment::LoadCluster(
//Read Size //Read Size
if ((pos + 1) > avail)
{
len = 1;
return E_BUFFER_NOT_FULL;
}
result = GetUIntLength(m_pReader, pos, len); result = GetUIntLength(m_pReader, pos, len);
if (result < 0) //error if (result < 0) //error
return static_cast<long>(result); return static_cast<long>(result);
if (result > 0) if (result > 0) //weird
{ {
len = 1; len = 1;
return E_BUFFER_NOT_FULL; return E_BUFFER_NOT_FULL;
@@ -1337,6 +1362,9 @@ long Segment::LoadCluster(
if ((pos + len) > stop) if ((pos + len) > stop)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
if ((pos + len) > avail)
return E_BUFFER_NOT_FULL;
const long long size = ReadUInt(m_pReader, pos, len); const long long size = ReadUInt(m_pReader, pos, len);
if (size < 0) //error if (size < 0) //error
@@ -1359,13 +1387,6 @@ long Segment::LoadCluster(
len = static_cast<long>(size); len = static_cast<long>(size);
long long total, avail;
const int status = m_pReader->Length(&total, &avail);
assert(status == 0); //TODO
assert(total >= 0);
assert(avail <= total);
if ((pos + size) > avail) if ((pos + size) > avail)
return E_BUFFER_NOT_FULL; return E_BUFFER_NOT_FULL;