virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

tga: check palette size earlier.

Browse Source 
Fixes Ticket1895

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-25 22:30:22 +01:00
parent e55c3857d2
commit 579d21f777
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/targa.c
View File

@ -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;