avi: skip list chunks correctly

[nihav.git] / src / demuxers / avi.rs

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index e5f688afd6a73a41c39864f362a6e7a4c6b124c4..2d2a261f591bd2c968b3a9ad774a872d7ddae7d3 100644 (file)
--- a/src/demuxers/avi.rs
+++ b/src/demuxers/avi.rs
@@ -78,6 +78,10 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> {
         if self.movi_size == 0 { return Err(EOF); }
         let mut tag: [u8; 4] = [0; 4];
         loop {
+            if (self.src.tell() & 1) == 1 {
+                self.src.read_skip(1)?;
+                self.movi_size -= 1;
+            }
             self.src.read_buf(&mut tag)?;
             let size = self.src.read_u32le()? as usize;
             if mktag!(tag) == mktag!(b"JUNK") {
@@ -135,7 +139,8 @@ impl<'a> AVIDemuxer<'a> {
         if RIFFTag::Chunk(tag) == end_tag {
             return Ok((size, true));
         }
-        let ltag = if is_list_tag(tag) { self.src.read_u32be()? } else { 0 };
+        let is_list = is_list_tag(tag);
+        let ltag = if is_list { self.src.read_u32be()? } else { 0 };
         if RIFFTag::List(tag, ltag) == end_tag {
             return Ok((size, true));
         }
@@ -144,6 +149,7 @@ impl<'a> AVIDemuxer<'a> {
             if RIFFTag::Chunk(tag) == CHUNKS[i].tag {
                 let psize = (CHUNKS[i].parse)(self, size)?;
                 if psize != size { return Err(InvalidData); }
+                if (psize & 1) == 1 { self.src.read_skip(1)?; }
                 return Ok((size + 8, false));
             }
             if RIFFTag::List(tag, ltag) == CHUNKS[i].tag {
@@ -155,12 +161,23 @@ impl<'a> AVIDemuxer<'a> {
                     let (psize, _) = self.parse_chunk(end_tag, rest_size, depth+1)?;
                     if psize > rest_size { return Err(InvalidData); }
                     rest_size -= psize;
+                    if (psize & 1) == 1 {
+                        if rest_size > 0 {
+                            rest_size -= 1;
+                        }
+                    }
                 }
 
                 return Ok((size + 8, false));
             }
         }
-        self.src.read_skip(size)?;
+        if !is_list {
+            self.src.read_skip(size)?;
+        } else {
+            if size < 4 { return Err(InvalidData); }
+            self.src.read_skip(size - 4)?;
+        }
+        if (size & 1) == 1 { self.src.read_skip(1)?; }
         return Ok((size + 8, false));
     }