summaryrefslogtreecommitdiff
path: root/libavformat/mvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-02-23 09:27:27 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2020-02-25 19:57:16 +0100
commit618a9bea65112a27a106e02ada3ae475cc8ac1ac (patch)
tree34410fd43350a5ac5bb3857460d4275cf964928f /libavformat/mvdec.c
parentf701414bd54639f0b0cc72e129ac1a6e9141c6f8 (diff)
downloadffmpeg-618a9bea65112a27a106e02ada3ae475cc8ac1ac.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>
Diffstat (limited to 'libavformat/mvdec.c')
-rw-r--r--libavformat/mvdec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c
index f9f7e38137..64166a84b1 100644
--- a/libavformat/mvdec.c
+++ b/libavformat/mvdec.c
@@ -363,6 +363,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;