@@ -128,7 +128,7 @@ ASDCP::MXF::RIP::InitFromFile(const Kumu::FileReader& Reader)
128128 if (m_ValueLength < 4 )
129129 {
130130 DefaultLogSink ().Error (" RIP is too short.\n " );
131- return RESULT_FAIL ;
131+ return RESULT_KLV_CODING (__LINE__, __FILE__) ;
132132 }
133133 Kumu::MemIOReader MemRDR (m_ValueStart, m_ValueLength - 4 );
134134 result = PairArray.Unarchive (&MemRDR) ? RESULT_OK : RESULT_KLV_CODING (__LINE__, __FILE__);
@@ -456,7 +456,7 @@ ASDCP::MXF::Primer::InitFromBuffer(const byte_t* p, ui32_t l)
456456 if (m_ValueStart + m_ValueLength > p + l)
457457 {
458458 DefaultLogSink ().Error (" Primer entry too long.\n " );
459- return RESULT_FAIL ;
459+ return RESULT_KLV_CODING (__LINE__, __FILE__) ;
460460 }
461461 Kumu::MemIOReader MemRDR (m_ValueStart, m_ValueLength);
462462 result = LocalTagEntryBatch.Unarchive (&MemRDR) ? RESULT_OK : RESULT_KLV_CODING (__LINE__, __FILE__);
@@ -1390,11 +1390,12 @@ ASDCP::MXF::InterchangeObject::InitFromBuffer(const byte_t* p, ui32_t l)
13901390
13911391 if ( ASDCP_SUCCESS (result) )
13921392 {
1393- if (m_ValueStart + m_ValueLength > p + l)
1394- {
1395- DefaultLogSink ().Error (" Interchange Object value extends past buffer length.\n " );
1396- return RESULT_FAIL;
1397- }
1393+ if ( ( m_ValueStart + m_ValueLength ) > ( p + l ) )
1394+ {
1395+ DefaultLogSink ().Error (" Interchange Object value extends past buffer length.\n " );
1396+ return RESULT_KLV_CODING (__LINE__, __FILE__);
1397+ }
1398+
13981399 TLVReader MemRDR (m_ValueStart, m_ValueLength, m_Lookup);
13991400 result = InitFromTLVSet (MemRDR);
14001401 }
0 commit comments