avcodec/wavarc: Check k

Fixes: Assertion failure
Fixes: 55849/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6590105973555200

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 4dee46426e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
release/6.0
Michael Niedermayer 2 years ago
parent c56f84e656
commit e4eed31133
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
  1. 4
      libavcodec/wavarc.c

@ -192,6 +192,8 @@ static int decode_1dif(AVCodecContext *avctx,
if (block_type < 4 && block_type >= 0) { if (block_type < 4 && block_type >= 0) {
k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P); k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P);
k = get_urice(gb, k) + 1; k = get_urice(gb, k) + 1;
if (k > 32)
return AVERROR_INVALIDDATA;
} }
switch (block_type) { switch (block_type) {
@ -282,6 +284,8 @@ static int decode_2slp(AVCodecContext *avctx,
if (block_type < 5 && block_type >= 0) { if (block_type < 5 && block_type >= 0) {
k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P); k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P);
k = get_urice(gb, k) + 1; k = get_urice(gb, k) + 1;
if (k > 32)
return AVERROR_INVALIDDATA;
} }
switch (block_type) { switch (block_type) {

Loading…
Cancel
Save