RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

gifdec: return more meaningful error codes 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-08-07 03:55:28 +00:00
parent f64288960b
commit 2da5a5ce00
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/gifdec.c
View File

@ -206,13 +206,13 @@ static int gif_read_header1(GifState *s)
int has_global_palette; int has_global_palette;
if (s->bytestream_end < s->bytestream + 13) if (s->bytestream_end < s->bytestream + 13)
return -1; return AVERROR_INVALIDDATA;
/* read gif signature */ /* read gif signature */
bytestream_get_buffer(&s->bytestream, sig, 6); bytestream_get_buffer(&s->bytestream, sig, 6);
if (memcmp(sig, gif87a_sig, 6) != 0 && if (memcmp(sig, gif87a_sig, 6) != 0 &&
memcmp(sig, gif89a_sig, 6) != 0) memcmp(sig, gif89a_sig, 6) != 0)
return -1; return AVERROR_INVALIDDATA;
/* read screen header */ /* read screen header */
s->transparent_color_index = -1; s->transparent_color_index = -1;
@ -221,7 +221,7 @@ static int gif_read_header1(GifState *s)
if( (unsigned)s->screen_width > 32767 if( (unsigned)s->screen_width > 32767
|| (unsigned)s->screen_height > 32767){ || (unsigned)s->screen_height > 32767){
av_log(s->avctx, AV_LOG_ERROR, "picture size too large\n"); av_log(s->avctx, AV_LOG_ERROR, "picture size too large\n");
return -1; return AVERROR_INVALIDDATA;
} }
v = bytestream_get_byte(&s->bytestream); v = bytestream_get_byte(&s->bytestream);
@ -238,7 +238,7 @@ static int gif_read_header1(GifState *s)
if (has_global_palette) { if (has_global_palette) {
n = 1 << s->bits_per_pixel; n = 1 << s->bits_per_pixel;
if (s->bytestream_end < s->bytestream + n * 3) if (s->bytestream_end < s->bytestream + n * 3)
return -1; return AVERROR_INVALIDDATA;
bytestream_get_buffer(&s->bytestream, s->global_palette, n * 3); bytestream_get_buffer(&s->bytestream, s->global_palette, n * 3);
} }
return 0; return 0;
@ -291,8 +291,8 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, A
s->bytestream = buf; s->bytestream = buf;
s->bytestream_end = buf + buf_size; s->bytestream_end = buf + buf_size;
if (gif_read_header1(s) < 0) if ((ret = gif_read_header1(s)) < 0)
return -1; return ret;
avctx->pix_fmt = PIX_FMT_PAL8; avctx->pix_fmt = PIX_FMT_PAL8;
if (av_image_check_size(s->screen_width, s->screen_height, 0, avctx)) if (av_image_check_size(s->screen_width, s->screen_height, 0, avctx))
@ -301,9 +301,9 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, A
if (s->picture.data[0]) if (s->picture.data[0])
avctx->release_buffer(avctx, &s->picture); avctx->release_buffer(avctx, &s->picture);
if (avctx->get_buffer(avctx, &s->picture) < 0) { if ((ret = avctx->get_buffer(avctx, &s->picture)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return ret;
} }
s->image_palette = (uint32_t *)s->picture.data[1]; s->image_palette = (uint32_t *)s->picture.data[1];
ret = gif_parse_next_image(s); ret = gif_parse_next_image(s);