tiff: Check that there is no aliasing in pixel format selection
authorAnton Khirnov <anton@khirnov.net>
Sat, 7 Mar 2015 21:06:59 +0000 (22:06 +0100)
committerLuca Barbato <lu_zero@gentoo.org>
Sun, 8 Mar 2015 18:14:14 +0000 (19:14 +0100)
Fixes possible issues with unexpected bpp/bppcount values.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Bug-Id: CVE-2014-8544
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavcodec/tiff.c

index 08e8a87..b071c3b 100644 (file)
@@ -252,6 +252,14 @@ static int init_image(TiffContext *s, AVFrame *frame)
 {
     int ret;
 
+    // make sure there is no aliasing in the following switch
+    if (s->bpp >= 100 || s->bppcount >= 10) {
+        av_log(s->avctx, AV_LOG_ERROR,
+               "Unsupported image parameters: bpp=%d, bppcount=%d\n",
+               s->bpp, s->bppcount);
+        return AVERROR_INVALIDDATA;
+    }
+
     switch (s->planar * 1000 + s->bpp * 10 + s->bppcount) {
     case 11:
         s->avctx->pix_fmt = AV_PIX_FMT_MONOBLACK;