From 05d09fcb292c759cd0b3d994d32b645bf0b2ea09 Mon Sep 17 00:00:00 2001 From: Daniel Kang Date: Thu, 6 Jan 2011 14:49:33 -0500 Subject: [PATCH] Moves check for invalid header before reading in data. --- libavcodec/tiff.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index a23af1a..c1b71dc 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -263,6 +263,10 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t * s->height = value; break; case TIFF_BPP: + if(count > 4){ + av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d, %d components)\n", s->bpp, count); + return -1; + } if(count == 1) s->bpp = value; else{ switch(type){ @@ -278,10 +282,6 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t * s->bpp = -1; } } - if(count > 4){ - av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d, %d components)\n", s->bpp, count); - return -1; - } switch(s->bpp*10 + count){ case 11: s->avctx->pix_fmt = PIX_FMT_MONOBLACK; -- 1.7.2.2