highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mlvdec: fail reading a packet with 0 streams

Browse Source 
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 5bd5c31087)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2020-05-31 14:30:43 +02:00
parent 0a8b2def0a
commit b25d00f6a1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mlvdec.c
View File

@@ -393,10 +393,14 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt)
{ {
MlvContext *mlv = avctx->priv_data; MlvContext *mlv = avctx->priv_data;
AVIOContext *pb; AVIOContext *pb;
AVStream *st = avctx->streams[mlv->stream_index]; AVStream *st;
int index, ret; int index, ret;
unsigned int size, space; unsigned int size, space;
if (!avctx->nb_streams)
return AVERROR_EOF;
st = avctx->streams[mlv->stream_index];
if (mlv->pts >= st->duration) if (mlv->pts >= st->duration)
return AVERROR_EOF; return AVERROR_EOF;