smc: fix repeat-two-blocks case

[nihav.git] / nihav-qt / src / codecs / smc.rs

diff --git a/nihav-qt/src/codecs/smc.rs b/nihav-qt/src/codecs/smc.rs
index 16f13b4548d624cf63933ce874ee03c55ec979e3..5364b08e680b3c7b0bbf2360d0bb7c5fb371e9d2 100644 (file)
--- 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()?;