diff options
| author | jhurst <jhurst@cinecert.com> | 2016-06-28 22:00:06 +0000 |
|---|---|---|
| committer | jhurst <> | 2016-06-28 22:00:06 +0000 |
| commit | 976a32de62b29ed688abecdebd6cb57f3ed299e7 (patch) | |
| tree | b402cc53c5141043d5282b8b5907f87724bf492c /src/h__02_Reader.cpp | |
| parent | 7fc5128ca2651e66913f26f0d2e4129511d89afd (diff) | |
o Fixed a bug in the index reader that allowed an out-of-bounds vector index to be used
o Modified the IndexEntry parser to ignore additional bytes belonging to slice values
Diffstat (limited to 'src/h__02_Reader.cpp')
| -rw-r--r-- | src/h__02_Reader.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/h__02_Reader.cpp b/src/h__02_Reader.cpp index d852592..9e07f72 100644 --- a/src/h__02_Reader.cpp +++ b/src/h__02_Reader.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2011-2015, Robert Scheler, Heiko Sparenberg Fraunhofer IIS, +Copyright (c) 2011-2016, Robert Scheler, Heiko Sparenberg Fraunhofer IIS, John Hurst All rights reserved. @@ -353,7 +353,7 @@ AS_02::MXF::AS02IndexReader::Lookup(ui32_t frame_num, ASDCP::MXF::IndexTableSegm { ui64_t start_pos = segment->IndexStartPosition; - if ( segment->EditUnitByteCount > 0 ) + if ( segment->EditUnitByteCount > 0 ) // CBR { if ( m_PacketList->m_List.size() > 1 ) DefaultLogSink().Error("Unexpected multiple IndexTableSegment in CBR file\n"); @@ -365,13 +365,21 @@ AS_02::MXF::AS02IndexReader::Lookup(ui32_t frame_num, ASDCP::MXF::IndexTableSegm return RESULT_OK; } else if ( (ui64_t)frame_num >= start_pos - && (ui64_t)frame_num < (start_pos + segment->IndexDuration) ) + && (ui64_t)frame_num < (start_pos + segment->IndexDuration) ) // VBR in segments { ui64_t tmp = frame_num - start_pos; assert(tmp <= 0xFFFFFFFFL); - Entry = segment->IndexEntryArray[(ui32_t) tmp]; - Entry.StreamOffset = Entry.StreamOffset - segment->RtEntryOffset + segment->RtFileOffset; - return RESULT_OK; + + if ( tmp < segment->IndexEntryArray.size() ) + { + Entry = segment->IndexEntryArray[(ui32_t) tmp]; + Entry.StreamOffset = Entry.StreamOffset - segment->RtEntryOffset + segment->RtFileOffset; + return RESULT_OK; + } + else + { + DefaultLogSink().Error("Malformed index table segment, IndexDuration does not match entries.\n"); + } } } } |