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

fixed bug: was searching outside array bounds

Browse Source 
Change-Id: If02466f240dc2a00b2a9a8f75b0ffa27a8984ec0
This commit is contained in:
matthewjheaney
2010-11-22 16:29:40 -05:00
parent fd1d8006f0
commit 157775ac74
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mkvparser.cpp
View File

@@ -3340,23 +3340,24 @@ long VideoTrack::Seek(
if (pResult->EOS()) if (pResult->EOS())
return 0; return 0;
const long count = m_pSegment->GetCount();
assert(count > 0);
const Cluster* pCluster = pResult->GetCluster(); const Cluster* pCluster = pResult->GetCluster();
assert(pCluster); assert(pCluster);
assert(pCluster->m_index >= 0);
assert(pCluster->m_index < count);
if (time_ns <= pResult->GetBlock()->GetTime(pCluster)) if (time_ns <= pResult->GetBlock()->GetTime(pCluster))
return 0; return 0;
Cluster** const i = m_pSegment->m_clusters + pCluster->m_index; Cluster** const clusters = m_pSegment->m_clusters;
assert(clusters);
const long count = m_pSegment->GetCount();
assert(count > 0);
Cluster** const i = clusters + pCluster->m_index;
assert(i); assert(i);
assert(*i == pCluster); assert(*i == pCluster);
assert(pCluster->GetTime() <= time_ns); assert(pCluster->GetTime() <= time_ns);
Cluster** const j = i + count; Cluster** const j = clusters + count;
Cluster** lo = i; Cluster** lo = i;
Cluster** hi = j; Cluster** hi = j;
@@ -3523,23 +3524,24 @@ long AudioTrack::Seek(
if (pResult->EOS()) if (pResult->EOS())
return 0; return 0;
const long count = m_pSegment->GetCount();
assert(count > 0);
const Cluster* pCluster = pResult->GetCluster(); const Cluster* pCluster = pResult->GetCluster();
assert(pCluster); assert(pCluster);
assert(pCluster->m_index >= 0);
assert(pCluster->m_index < count);
if (time_ns <= pResult->GetBlock()->GetTime(pCluster)) if (time_ns <= pResult->GetBlock()->GetTime(pCluster))
return 0; return 0;
Cluster** const i = m_pSegment->m_clusters + pCluster->m_index; Cluster** const clusters = m_pSegment->m_clusters;
assert(clusters);
const long count = m_pSegment->GetCount();
assert(count > 0);
Cluster** const i = clusters + pCluster->m_index;
assert(i); assert(i);
assert(*i == pCluster); assert(*i == pCluster);
assert(pCluster->GetTime() <= time_ns); assert(pCluster->GetTime() <= time_ns);
Cluster** const j = i + count; Cluster** const j = clusters + count;
Cluster** lo = i; Cluster** lo = i;
Cluster** hi = j; Cluster** hi = j;