RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/demux: Make read_frame_internal() return AVERREOR(EAGAIN) on stuck empty input parser 

Fixes: read_frame_internal() which does not return even though both demuxer and parser do return
Fixes: 43717/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5206008287330304

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2022-02-08 20:00:53 +01:00
parent 1b3ec3c8ca
commit 02699490c1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/demux.c
View File

@ -1235,11 +1235,15 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
FFFormatContext *const si = ffformatcontext(s); FFFormatContext *const si = ffformatcontext(s);
int ret, got_packet = 0; int ret, got_packet = 0;
AVDictionary *metadata = NULL; AVDictionary *metadata = NULL;
int empty = 0;
while (!got_packet && !si->parse_queue.head) { while (!got_packet && !si->parse_queue.head) {
AVStream *st; AVStream *st;
FFStream *sti; FFStream *sti;
if (empty > 1)
return AVERROR(EAGAIN);
/* read next packet */ /* read next packet */
ret = ff_read_packet(s, pkt); ret = ff_read_packet(s, pkt);
if (ret < 0) { if (ret < 0) {
@ -1330,6 +1334,8 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
} }
got_packet = 1; got_packet = 1;
} else if (st->discard < AVDISCARD_ALL) { } else if (st->discard < AVDISCARD_ALL) {
if (pkt->size == 0)
empty ++;
if ((ret = parse_packet(s, pkt, pkt->stream_index, 0)) < 0) if ((ret = parse_packet(s, pkt, pkt->stream_index, 0)) < 0)
return ret; return ret;
st->codecpar->sample_rate = sti->avctx->sample_rate; st->codecpar->sample_rate = sti->avctx->sample_rate;