From e598b19dad9638c2c108ac5f39df6573563b0691 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 6 Nov 2017 17:12:58 +0100 Subject: demux_mkv: allow 0 sized packets Fixes some obscure sample that uses fixed size laces with 0-sized lace size. Some broken shit. (Maybe the decoder wouldn't care about these packets, but the demuxer attempted to resync after these packet reading errors, even though they were perfectly recoverable. But I don't care enough about this.) Sample link: https://samples.ffmpeg.org/Matroska/switzler084d_dl.mkv --- demux/demux_mkv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demux/demux_mkv.c') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index e9fa70b823..5f3ec6d514 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -2515,7 +2515,7 @@ static int read_block(demuxer_t *demuxer, int64_t end, struct block_info *block) uint8_t c2 = stream_read_char(s); time = c1 << 8 | c2; - if (stream_tell(s) + 2 >= endpos) + if (stream_tell(s) + 2 > endpos) goto exit; uint8_t header_flags = stream_read_char(s); -- cgit v1.2.3