diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-06 02:13:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-12 02:55:47 +0100 |
| commit | bcedc2b0f0e47edc2670200c91a49b36e4c07257 (patch) | |
| tree | 18fd478468e0b157a4fa1d92638180545213f12d | |
| parent | 6ad10cbec954ab00dfa88046e4d309f32773f3e3 (diff) | |
| download | ffmpeg-bcedc2b0f0e47edc2670200c91a49b36e4c07257.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>
| -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 */ |