Commit 579d21f7 authored by Michael Niedermayer's avatar Michael Niedermayer

tga: check palette size earlier.

Fixes Ticket1895
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent e55c3857
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment