mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
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>
This commit is contained in:
parent
db27a35012
commit
96caa01f13
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user