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

1 files changed, 10 insertions, 2 deletions

diff --git a/src/MXF.cpp b/src/MXF.cpp
index 92ae5bb..45b0298 100755
--- a/src/MXF.cpp
+++ b/src/MXF.cpp
@@ -1216,8 +1216,16 @@ ASDCP::MXF::OPAtomIndexFooter::Lookup(ui32_t frame_num, IndexTableSegment::Index
 	    {
 	      ui64_t tmp = frame_num - start_pos;
 	      assert(tmp <= 0xFFFFFFFFL);
-	      Entry = segment->IndexEntryArray[(ui32_t) tmp];
-	      return RESULT_OK;
+
+	      if ( tmp < segment->IndexEntryArray.size() )
+		{
+		  Entry = segment->IndexEntryArray[(ui32_t) tmp];
+		  return RESULT_OK;
+		}
+	      else
+		{
+		  DefaultLogSink().Error("Malformed index table segment, IndexDuration does not match entries.\n");
+		}
 	    }
 	}
     }