diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-08 19:30:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-06 20:30:57 +0100 |
| commit | bdacbbba69c8272b2c94aa227272feaf4d2b1591 (patch) | |
| tree | 4907b69cbbcb4e3cecd011003e60a85b44e1c490 | |
| parent | f7218d155e5a45229d84aaebc8fe717d05f3c342 (diff) | |
| download | ffmpeg-bdacbbba69c8272b2c94aa227272feaf4d2b1591.tar.gz | |
avcodec/vc1: Check for excessive resolution
Fixes: overflow in aspect ratio calculation
Fixes: signed integer overflow: 393215 * 14594 cannot be represented in type 'int'
Fixes: 15728/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV3IMAGE_fuzzer-5661588893204480
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 181e138da7207523b387eabc28d24e74a46248bc)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/vc1.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index d0cf03d09f..df54ba30f0 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -457,7 +457,11 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) h = get_bits(gb, 8) + 1; v->s.avctx->sample_aspect_ratio = (AVRational){w, h}; } else { - av_reduce(&v->s.avctx->sample_aspect_ratio.num, + if (v->s.avctx->width > v->max_coded_width || + v->s.avctx->height > v->max_coded_height) { + avpriv_request_sample(v->s.avctx, "Huge resolution"); + } else + av_reduce(&v->s.avctx->sample_aspect_ratio.num, &v->s.avctx->sample_aspect_ratio.den, v->s.avctx->height * w, v->s.avctx->width * h, |