X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-qt%2Fsrc%2Fcodecs%2Fsmc.rs;h=b53ca5cff3ec638769299196096251e1f636c809;hb=886cde4847280b96e10d240c2f2d76abec121dc8;hp=401b3c49b6885461e341d12aaaca5d836aba57ba;hpb=6617c7576ec351996033c436c15f64ae2086ff1e;p=nihav.git diff --git a/nihav-qt/src/codecs/smc.rs b/nihav-qt/src/codecs/smc.rs index 401b3c4..b53ca5c 100644 --- a/nihav-qt/src/codecs/smc.rs +++ b/nihav-qt/src/codecs/smc.rs @@ -119,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 { @@ -131,6 +132,7 @@ impl NADecoder for SmcDecoder { doff += stride * 4; } } + blockpos += len; }, 3 => { let clr = br.read_byte()?; @@ -291,6 +293,7 @@ mod test { use nihav_codec_support::test::dec_video::*; use crate::qt_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; + // samples from https://samples.mplayerhq.hu/V-codecs/SMC #[test] fn test_smc() { let mut dmx_reg = RegisteredDemuxers::new();