diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-08-20 00:59:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-08-26 20:31:09 +0200 |
| commit | ca47402a06922f5280b4526007e32bf7847c7430 (patch) | |
| tree | 3000008a5982464731d25e9aaeb10b0482a68aa3 /libavcodec/tiff.c | |
| parent | 7577f8332a6bb2f227b876c83ec6fa45cc9670f9 (diff) | |
| download | ffmpeg-ca47402a06922f5280b4526007e32bf7847c7430.tar.gz | |
avcodec/tiff: Avoid abort with DNG RAW TIFF with YA8
Fixes: Assertion failure
Fixes: 24707/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5179910197608448
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/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 8c0b6f0853..8a5f6e030d 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -709,7 +709,7 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid if (is_dng) { int is_u16, pixel_size_bytes, pixel_size_bits, elements; - is_u16 = (s->bpp > 8); + is_u16 = (s->bpp / s->bppcount > 8); pixel_size_bits = (is_u16 ? 16 : 8); pixel_size_bytes = (is_u16 ? sizeof(uint16_t) : sizeof(uint8_t)); |