avcodec/tiff: more completely check bpp/bppcount
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2014 14:08:32 +0000 (16:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:40:04 +0000 (04:40 +0100)
commitaa17021e812eb2527033d85ba0390cc4f7d6c9d5
tree21eae6d44762c0ca8e1993412e7b5be3124bf1ba
parentd68ae96ea8d8bac872854fc617ce6ad696ff2c2d
avcodec/tiff: more completely check bpp/bppcount

Fixes pixel format selection
Fixes out of array accesses
Fixes: asan_heap-oob_1766029_6_asan_heap-oob_20aa045_332_cov_1823216757_m2-d1d366d7965db766c19a66c7a2ccbb6b.tif

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e1c0cfaa419aa5d320540d5a1b3f8fd9b82ab7e5)

Conflicts:

libavcodec/tiff.c
libavcodec/tiff.c