summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-08-18 23:41:57 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-10-09 22:15:46 +0200
commitc2633805587feca1c2d87b8ef2b14aba3106a4a8 (patch)
tree11fc466f837c3ee41f8a68e0b2ac717052cf2d15
parentb2222721245cfbba2d3f6917f0ab316aaeb76db3 (diff)
downloadffmpeg-c2633805587feca1c2d87b8ef2b14aba3106a4a8.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 948b813f7f..a3b0bc4649 100644
--- a/libavcodec/speedhq.c
+++ b/libavcodec/speedhq.c
@@ -424,7 +424,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];