From 579d21f777ea1cb51a47f38b4429742837b05404 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 25 Nov 2012 22:30:22 +0100 Subject: [PATCH] tga: check palette size earlier. Fixes Ticket1895 Signed-off-by: Michael Niedermayer --- libavcodec/targa.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/targa.c b/libavcodec/targa.c index 67ed0d5b33..d761078cfe 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -172,6 +172,11 @@ static int decode_frame(AVCodecContext *avctx, if (s->picture.data[0]) avctx->release_buffer(avctx, &s->picture); + if (colors && (colors + first_clr) > 256) { + av_log(avctx, AV_LOG_ERROR, "Incorrect palette: %i colors with offset %i\n", colors, first_clr); + return AVERROR_INVALIDDATA; + } + if ((ret = av_image_check_size(w, h, 0, avctx))) return ret; if (w != avctx->width || h != avctx->height) @@ -194,10 +199,6 @@ static int decode_frame(AVCodecContext *avctx, if (colors) { int pal_size, pal_sample_size; - if ((colors + first_clr) > 256) { - av_log(avctx, AV_LOG_ERROR, "Incorrect palette: %i colors with offset %i\n", colors, first_clr); - return AVERROR_INVALIDDATA; - } switch (csize) { case 32: pal_sample_size = 4; break; case 24: pal_sample_size = 3; break;