X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-qt%2Fsrc%2Fcodecs%2Fsmc.rs;h=5364b08e680b3c7b0bbf2360d0bb7c5fb371e9d2;hb=6d240c6b3c031388c3bcc6b96f14de8d60e2b4ae;hp=16f13b4548d624cf63933ce874ee03c55ec979e3;hpb=b7c882c1ce6f86c07c2340751200e3a060942826;p=nihav.git diff --git a/nihav-qt/src/codecs/smc.rs b/nihav-qt/src/codecs/smc.rs index 16f13b4..5364b08 100644 --- a/nihav-qt/src/codecs/smc.rs +++ b/nihav-qt/src/codecs/smc.rs @@ -62,8 +62,7 @@ impl NADecoder for SmcDecoder { let mut mr = MemoryReader::new_read(src.as_slice()); let mut br = ByteReader::new(&mut mr); - let id = br.read_byte()?; - validate!(id == 0x80); + let _flags = br.read_byte()?; let length = br.read_u24be()? as usize; validate!(length == src.len()); @@ -120,7 +119,8 @@ impl NADecoder for SmcDecoder { llblock = lblock; }, 2 => { - for i in 0..len { + validate!(blockpos + len * 2 <= nblocks); + for i in 0..len*2 { if (i & 1) == 0 { Self::put_block(&mut frm.data[doff + x..], stride, &llblock); } else { @@ -132,6 +132,7 @@ impl NADecoder for SmcDecoder { doff += stride * 4; } } + blockpos += len; }, 3 => { let clr = br.read_byte()?;