aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-08-18 23:41:57 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-11-03 23:29:45 +0100
commit14ec214d5c61e7af4ec0da2838da35a3233990f6 (patch)
tree2504aa483ea8836888f715ca26b8615f9fc696fc
parent1f3236ac1ef692ef015cccec58b88ec8f4f0fcf1 (diff)
downloadffmpeg-14ec214d5c61e7af4ec0da2838da35a3233990f6.tar.gz
avcodec/speedhq: Check width
Fixes: out of array access Fixes: 50014/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEDHQ_fuzzer-4748914632294400 Alternatively the buffer size can be increased 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 f0395f9ef6051315973f1fdded1804f81458566d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/speedhq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c
index 743dacc6ce..128663ab75 100644
--- a/libavcodec/speedhq.c
+++ b/libavcodec/speedhq.c
@@ -497,7 +497,7 @@ static int speedhq_decode_frame(AVCodecContext *avctx,
uint32_t second_field_offset;
int ret;
- if (buf_size < 4 || avctx->width < 8)
+ if (buf_size < 4 || avctx->width < 8 || avctx->width % 8 != 0)
return AVERROR_INVALIDDATA;
quality = buf[0];