diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-01 01:49:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 12:11:55 +0200 |
| commit | ebe31077ce3a7163737dddb77bd75af6b24a023a (patch) | |
| tree | 95e05dcbd438bd56b21f0f41eca9d71141470c44 | |
| parent | 0d57e136afce6820bb7c6fec65037ec671896d3b (diff) | |
| download | ffmpeg-ebe31077ce3a7163737dddb77bd75af6b24a023a.tar.gz | |
avcodec/diracdec: Check that slices are fewer than pixels
Fixes: Timeout (197sec ->144ms)
Fixes: 15034/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5733549405110272
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 fbbc8ba67f19d55380b1bc8b5f057328c266d747)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/diracdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 125ecaac85..d6c2132c3b 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1246,7 +1246,9 @@ static int dirac_unpack_idwt_params(DiracContext *s) s->num_y = get_interleaved_ue_golomb(gb); if (s->num_x * s->num_y == 0 || s->num_x * (uint64_t)s->num_y > INT_MAX || s->num_x * (uint64_t)s->avctx->width > INT_MAX || - s->num_y * (uint64_t)s->avctx->height > INT_MAX + s->num_y * (uint64_t)s->avctx->height > INT_MAX || + s->num_x > s->avctx->width || + s->num_y > s->avctx->height ) { av_log(s->avctx,AV_LOG_ERROR,"Invalid numx/y\n"); s->num_x = s->num_y = 0; |