aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-02-02 20:47:10 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-02-04 17:20:31 +0100
commitab82c105787fa81d1e35b9209f3d53e98be936a4 (patch)
tree2fa93da64bbbfd91721f130d22455e86ed835f4a /libavformat
parent4f3d8cb5549e1b54f87edda446177848896fa50c (diff)
downloadffmpeg-ab82c105787fa81d1e35b9209f3d53e98be936a4.tar.gz
avformat/mvdec: Sanity check SAMPLE_WIDTH
Fixes: signed integer overflow: 999999999 * 8 cannot be represented in type 'int' Fixes: 30048/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-5864289917337600 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mvdec.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c
index d8f121bea5..c4fa980bf2 100644
--- a/libavformat/mvdec.c
+++ b/libavformat/mvdec.c
@@ -159,7 +159,10 @@ static int parse_audio_var(AVFormatContext *avctx, AVStream *st,
st->codecpar->sample_rate = var_read_int(pb, size);
avpriv_set_pts_info(st, 33, 1, st->codecpar->sample_rate);
} else if (!strcmp(name, "SAMPLE_WIDTH")) {
- st->codecpar->bits_per_coded_sample = var_read_int(pb, size) * 8;
+ uint64_t bpc = var_read_int(pb, size) * (uint64_t)8;
+ if (bpc > 16)
+ return AVERROR_INVALIDDATA;
+ st->codecpar->bits_per_coded_sample = bpc;
} else
return AVERROR_INVALIDDATA;