X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Favi.rs;h=4be5217d2cffbf59839947d73aecefec84d595b5;hb=56af6a928847ed91e11eb20141b43c8b5d3bd864;hp=67195c2ddb61c4b7bf4c9d9bea4bc1495cfeda2c;hpb=d293626f59d2bc15dcff83af03072688eed7656a;p=nihav.git

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index 67195c2..4be5217 100644
--- a/src/demuxers/avi.rs
+++ b/src/demuxers/avi.rs
@@ -81,6 +81,7 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> {
             if (self.src.tell() & 1) == 1 {
                 self.src.read_skip(1)?;
                 self.movi_size -= 1;
+                if self.movi_size == 0 { return Err(EOF); }
             }
             self.src.read_buf(&mut tag)?;
             let size = self.src.read_u32le()? as usize;
@@ -89,6 +90,12 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> {
                 self.src.read_skip(size)?;
                 continue;
             }
+            if mktag!(tag) == mktag!(b"LIST") {
+                self.movi_size -= 12;
+                self.src.read_skip(4)?;
+                if self.movi_size == 0 { return Err(EOF); }
+                continue;
+            }
             if tag[0] < b'0' || tag[0] > b'9' || tag[1] < b'0' || tag[1] > b'9' {
                 return Err(InvalidData);
             }