generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/tiff: more completely check bpp/bppcount

Browse Source 
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 e1c0cfaa41)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-03 16:08:32 +02:00
parent f2c6e2c3b4
commit f8bd98ae4d
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/tiff.c
View File

@@ -604,13 +604,13 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
s->height = value; s->height = value;
break; break;
case TIFF_BPP: case TIFF_BPP:
s->bppcount = count; if (count > 4U) {
if (count > 4) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"This format is not supported (bpp=%d, %d components)\n", "This format is not supported (bpp=%d, %d components)\n",
s->bpp, count); value, count);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
s->bppcount = count;
if (count == 1) if (count == 1)
s->bpp = value; s->bpp = value;
else { else {
@@ -628,6 +628,13 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
s->bpp = -1; s->bpp = -1;
} }
} }
if (s->bpp > 64U) {
av_log(s->avctx, AV_LOG_ERROR,
"This format is not supported (bpp=%d, %d components)\n",
s->bpp, count);
s->bpp = 0;
return AVERROR_INVALIDDATA;
}
break; break;
case TIFF_SAMPLES_PER_PIXEL: case TIFF_SAMPLES_PER_PIXEL:
if (count != 1) { if (count != 1) {