diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-06 02:13:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-06 02:55:48 +0100 |
| commit | b93a8bd838ddf4097f2cc7e6410e91dbaa7c727e (patch) | |
| tree | da7c1aa78daf208f8860e5dfd729e35fc8b75817 /libavformat/xmv.c | |
| parent | 2817eb514cb724290e9b2265bd89c47dfc76348c (diff) | |
| download | ffmpeg-b93a8bd838ddf4097f2cc7e6410e91dbaa7c727e.tar.gz | |
avformat/xmv: Discard remainder of packet on error
Fixes infinite loop
Fixes: 9c48ae2680c5f23bca3d20ff0f325fd8/asan_generic_4c254d_1374_993f1e5967dd6f844b8d72f978ce2a6c.pss
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 79c4a338e4b2bf0bc6f81c9f455994f673a92f78)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/xmv.c')
| -rw-r--r-- | libavformat/xmv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/xmv.c b/libavformat/xmv.c index 06c070ca43..14d007a3e0 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -554,8 +554,11 @@ static int xmv_read_packet(AVFormatContext *s, result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1); } - if (result) + if (result) { + xmv->current_stream = 0; + xmv->video.current_frame = xmv->video.frame_count; return result; + } /* Increase our counters */ |