generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/xmv: Discard remainder of packet on error

Browse Source 
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 79c4a338e4)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-11-06 02:13:36 +01:00
parent 46cece74c3
commit fd7bb09e8a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/xmv.c
View File

@@ -552,8 +552,11 @@ static int xmv_read_packet(AVFormatContext *s,
result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1); 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; return result;
}
/* Increase our counters */ /* Increase our counters */