summaryrefslogtreecommitdiff
path: root/libavformat/mlvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-05-31 14:30:43 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-06-07 22:01:12 +0200
commit5bd5c3108786bf69f108c55c375f1956f67ca7a4 (patch)
tree1aff8b0ff327bde889db3bc37f3b46fa7212c509 /libavformat/mlvdec.c
parent1ba8484559661dfdbca36dbc17b203f33f62e26c (diff)
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>
Diffstat (limited to 'libavformat/mlvdec.c')
-rw-r--r--libavformat/mlvdec.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c
index dae13cae53..03aed71024 100644
--- a/libavformat/mlvdec.c
+++ b/libavformat/mlvdec.c
@@ -393,10 +393,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;