Message ID | 20190112222803.11581-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | ec28a85107cccece4dce17c0ccb633defe2d6e98 |
Headers | show |
On Sat, Jan 12, 2019 at 11:28:00PM +0100, Michael Niedermayer wrote: > Fixes: Assertion failure > Fixes: 11898/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5759794191794176 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/tiff.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) will apply patchset [...]
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 570b3cbd01..5cf2a4417e 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -619,7 +619,7 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid if (s->compr == TIFF_CCITT_RLE || s->compr == TIFF_G3 || s->compr == TIFF_G4) { - if (is_yuv) + if (is_yuv || p->format == AV_PIX_FMT_GRAY12) return AVERROR_INVALIDDATA; return tiff_unpack_fax(s, dst, stride, src, size, width, lines);
Fixes: Assertion failure Fixes: 11898/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5759794191794176 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/tiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)