RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/clearvideo: Check for 0 tile_shift 

Fixes: shift exponent -1 is negative
Fixes: 33401/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CLEARVIDEO_fuzzer-5908683596890112

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 63e75e09ae)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-04-19 16:46:08 +02:00
parent 9e98ee41e7
commit a19e2a5a94
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/clearvideo.c
View File

@ -665,8 +665,8 @@ static av_cold int clv_decode_init(AVCodecContext *avctx)
} }
c->tile_shift = av_log2(c->tile_size); c->tile_shift = av_log2(c->tile_size);
if (1U << c->tile_shift != c->tile_size) { if (1U << c->tile_shift != c->tile_size || c->tile_shift < 1) {
av_log(avctx, AV_LOG_ERROR, "Tile size: %d, is not power of 2.\n", c->tile_size); av_log(avctx, AV_LOG_ERROR, "Tile size: %d, is not power of 2 > 1\n", c->tile_size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }