diff options
| author | Michael Niedermayer <[email protected]> | 2020-02-23 09:27:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2020-07-01 13:33:44 +0200 |
| commit | 07a265b140f8698c73eec2f1f108b8a1914ca3c4 (patch) | |
| tree | 662ee81a83ccd47a23375b5620fe4d56d9336dd3 | |
| parent | 702ce6c8ee8f67cf9a5cfd9c1e7e69f3c1191c2b (diff) | |
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 <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 618a9bea65112a27a106e02ada3ae475cc8ac1ac)
Signed-off-by: Michael Niedermayer <[email protected]>
| -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; |