diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-11-30 19:46:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-04-06 20:27:35 +0200 |
| commit | a3041cf48bcab894102fd67a2615c1a2cfde2171 (patch) | |
| tree | 69cd3887e37190ae112f2934b4df28a32f42974f /libavcodec | |
| parent | 4ff9f77240106bd441359184f58e37ad74efa5c2 (diff) | |
| download | ffmpeg-a3041cf48bcab894102fd67a2615c1a2cfde2171.tar.gz | |
avcodec/vp3: Check version in all cases when VP4 code is not built
Fixes: out of array read
Fixes: 40284/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP3_fuzzer-4599568176644096
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 96caa01f130526cb420d0706a40fb63695153128)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vp3.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 57c6eb1ff9..aa6d943822 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2691,7 +2691,14 @@ static int vp3_decode_frame(AVCodecContext *avctx, skip_bits(&gb, 4); /* width code */ skip_bits(&gb, 4); /* height code */ if (s->version) { - s->version = get_bits(&gb, 5); + int version = get_bits(&gb, 5); +#if !CONFIG_VP4_DECODER + if (version >= 2) { + av_log(avctx, AV_LOG_ERROR, "This build does not support decoding VP4.\n"); + return AVERROR_DECODER_NOT_FOUND; + } +#endif + s->version = version; if (avctx->frame_number == 0) av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version); |