diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-31 14:30:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-05 12:43:08 +0200 |
| commit | 39806a275eb287c39fba7283d1b40dd0e72018bd (patch) | |
| tree | fd9f62a2e5d94fa9cb0d115ce18bd4eb5d28693f | |
| parent | 2d29c017667ec721b886d89f2e5c6c02d647b00c (diff) | |
| download | ffmpeg-39806a275eb287c39fba7283d1b40dd0e72018bd.tar.gz | |
avformat/mlvdec: fail reading a packet with 0 streams
Fixes: NULL pointer dereference
Fixes: 22604/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5667739074297856.fuzz
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5bd5c3108786bf69f108c55c375f1956f67ca7a4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mlvdec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c index 84b916844c..0ed0cb11a2 100644 --- a/libavformat/mlvdec.c +++ b/libavformat/mlvdec.c @@ -384,10 +384,14 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt) { MlvContext *mlv = avctx->priv_data; AVIOContext *pb; - AVStream *st = avctx->streams[mlv->stream_index]; + AVStream *st; int index, ret; unsigned int size, space; + if (!avctx->nb_streams) + return AVERROR_EOF; + + st = avctx->streams[mlv->stream_index]; if (mlv->pts >= st->duration) return AVERROR_EOF; |