summaryrefslogtreecommitdiff
path: root/libavcodec/vp3.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-11-30 19:46:17 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-12-01 17:44:56 +0100
commit96caa01f130526cb420d0706a40fb63695153128 (patch)
tree02a75cfcce9d28b7f4c0012217d36f46231e7a2c /libavcodec/vp3.c
parentdb27a350129aa9f1fe5670cbf9118a78193d89cf (diff)
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>
Diffstat (limited to 'libavcodec/vp3.c')
-rw-r--r--libavcodec/vp3.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 16726080b3..5b9ba60f49 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2685,7 +2685,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);