Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-19 17:46:08 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2021-05-13 00:00:07 +0300
commit63e75e09aef5836330a2786f0a9229ed82239e6b (patch)
tree3f00e6ba4a05e68934f89c009fb4c2fb5f861ddb /libavcodec/clearvideo.c
parente4be734e4fd7e9a8e30462f2e026185765ddc4ba (diff)
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>
Diffstat (limited to 'libavcodec/clearvideo.c')
-rw-r--r--libavcodec/clearvideo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c
index e5e33d3313..5c79376c64 100644
--- a/libavcodec/clearvideo.c
+++ b/libavcodec/clearvideo.c
@@ -722,8 +722,8 @@ static av_cold int clv_decode_init(AVCodecContext *avctx)
}
c->tile_shift = av_log2(c->tile_size);
- if (1U << c->tile_shift != c->tile_size) {
- av_log(avctx, AV_LOG_ERROR, "Tile size: %d, is not power of 2.\n", 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 > 1\n", c->tile_size);
return AVERROR_INVALIDDATA;
}