diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-23 18:28:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-24 10:35:47 +0100 |
| commit | 013f71497ba51e8381a6a4521b9279ed502e7077 (patch) | |
| tree | 154a35af57fcfd9a7f59f41ba59234fae87f963c /libavcodec | |
| parent | 5fceac1cdb823d2ead3538a32430c2016e00f7b2 (diff) | |
| download | ffmpeg-013f71497ba51e8381a6a4521b9279ed502e7077.tar.gz | |
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/ffmpeg
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/tiff.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 29a80a6892..3130eb8048 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -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; |