[FFmpeg-cvslog] tga: check palette size earlier.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 25 22:30:22 2012 +0100| [579d21f777ea1cb51a47f38b4429742837b05404] | committer: Michael Niedermayer

tga: check palette size earlier.

Fixes Ticket1895

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=579d21f777ea1cb51a47f38b4429742837b05404
---

 libavcodec/targa.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 67ed0d5..d761078 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;