[FFmpeg-cvslog] avcodec/wavarc: Check k

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Feb 18 23:08:59 2023 +0100| [4dee46426e6d23adda048414433c2887314a4267] | committer: Michael Niedermayer

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 at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4dee46426e6d23adda048414433c2887314a4267
---

 libavcodec/wavarc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c
index b626daa66e..8d37af9571 100644
--- a/libavcodec/wavarc.c
+++ b/libavcodec/wavarc.c
@@ -192,6 +192,8 @@ static int decode_1dif(AVCodecContext *avctx,
         if (block_type < 4 && block_type >= 0) {
             k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P);
             k = get_urice(gb, k) + 1;
+            if (k > 32)
+                return AVERROR_INVALIDDATA;
         }
 
         switch (block_type) {
@@ -282,6 +284,8 @@ static int decode_2slp(AVCodecContext *avctx,
         if (block_type < 5 && block_type >= 0) {
             k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P);
             k = get_urice(gb, k) + 1;
+            if (k > 32)
+                return AVERROR_INVALIDDATA;
         }
 
         switch (block_type) {