diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-02 20:47:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-20 14:21:24 +0100 |
| commit | 1563042dc3385d0fe6d53a09cf8844a62b7d94bb (patch) | |
| tree | ac3751fefeb31f0c211f1d89d406c50cadefcac0 | |
| parent | 93061bc90cfaea22fff160e27532a44f3aab1fbd (diff) | |
| download | ffmpeg-1563042dc3385d0fe6d53a09cf8844a62b7d94bb.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>
(cherry picked from commit ab82c105787fa81d1e35b9209f3d53e98be936a4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mvdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index d5b400213d..37e16870e7 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; |