Browse Source

avcodec/cook: Move up and extend block_align check

Fixes: signed integer overflow: 2046820356 * 8 cannot be represented in type 'int'
Fixes: 18391/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_COOK_fuzzer-5631674666188800

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 1c63edcdd2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.2.15
Michael Niedermayer 6 years ago
parent
commit
31ded792d4
1 changed files with 3 additions and 4 deletions
  1. +3
    -4
      libavcodec/cook.c

+ 3
- 4
libavcodec/cook.c View File

@@ -1075,6 +1075,9 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA;
}

if (avctx->block_align >= INT_MAX / 8)
return AVERROR(EINVAL);

/* Initialize RNG. */
av_lfg_init(&q->random_state, 0);

@@ -1242,10 +1245,6 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
if ((ret = init_cook_vlc_tables(q)))
return ret;


if (avctx->block_align >= UINT_MAX / 2)
return AVERROR(EINVAL);

/* Pad the databuffer with:
DECODE_BYTES_PAD1 or DECODE_BYTES_PAD2 for decode_bytes(),
AV_INPUT_BUFFER_PADDING_SIZE, for the bitstreamreader. */


Loading…
Cancel
Save