Commit 013f7149 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/tiff: do not allow bpp 40 with undefined pixel formats

Fixes: Out of array access, assertion failure
Fixes: 13851/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5754570929602560
Fixes: 13869/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5695998313103360
Fixes: 13873/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5077273645940736
Fixes: 13874/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5756396757319680
Fixes: 13877/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5741026750234624
Fixes: 13880/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5649148809838592

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegReviewed-by: 's avatarCarl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 5fceac1c
......@@ -830,6 +830,11 @@ static int init_image(TiffContext *s, ThreadFrame *frame)
case 405:
if (s->photometric == TIFF_PHOTOMETRIC_SEPARATED)
s->avctx->pix_fmt = AV_PIX_FMT_RGBA;
else {
av_log(s->avctx, AV_LOG_ERROR,
"bpp=40 without PHOTOMETRIC_SEPARATED is unsupported\n");
return AVERROR_PATCHWELCOME;
}
break;
case 483:
s->avctx->pix_fmt = s->le ? AV_PIX_FMT_RGB48LE : AV_PIX_FMT_RGB48BE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment