diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-02-23 09:27:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-03 12:10:23 +0200 |
| commit | 366929ab4e9f7b4d9cdbe721987a1d04bab7db15 (patch) | |
| tree | d1b36a5edc1f5618676f4e9763a2dfe6b1b77456 | |
| parent | a7dabc18ea2eff1fd827dcbba1a7296b5ecc132b (diff) | |
| download | ffmpeg-366929ab4e9f7b4d9cdbe721987a1d04bab7db15.tar.gz | |
avformat/mvdec: Check stream numbers
Fixes: null pointer dereference
Fixes: 20768/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5638648978735104.fuzz
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 618a9bea65112a27a106e02ada3ae475cc8ac1ac)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mvdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index fa596179ed..afa942ca5f 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -361,6 +361,12 @@ static int mv_read_header(AVFormatContext *avctx) if ((ret = read_table(avctx, NULL, parse_global_var)) < 0) return ret; + if (mv->nb_audio_tracks < 0 || mv->nb_video_tracks < 0 || + (mv->nb_audio_tracks == 0 && mv->nb_video_tracks == 0)) { + av_log(avctx, AV_LOG_ERROR, "Stream count is invalid.\n"); + return AVERROR_INVALIDDATA; + } + if (mv->nb_audio_tracks > 1) { avpriv_request_sample(avctx, "Multiple audio streams support"); return AVERROR_PATCHWELCOME; |