virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

gifdec: return meaningful error codes.

Browse Source
This commit is contained in:
Anton Khirnov
2012-11-19 10:30:01 +01:00
parent 3d973e461b
commit 048ffb9bb2
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/gifdec.c
View File

@@ -207,13 +207,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;
@@ -222,7 +222,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(NULL, AV_LOG_ERROR, "picture size too large\n"); av_log(NULL, 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);
@@ -239,7 +239,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;
@@ -249,6 +249,7 @@ static int gif_parse_next_image(GifState *s)
{ {
while (s->bytestream < s->bytestream_end) { while (s->bytestream < s->bytestream_end) {
int code = bytestream_get_byte(&s->bytestream); int code = bytestream_get_byte(&s->bytestream);
int ret;
av_dlog(s->avctx, "gif: code=%02x '%c'\n", code, code); av_dlog(s->avctx, "gif: code=%02x '%c'\n", code, code);
@@ -256,17 +257,17 @@ static int gif_parse_next_image(GifState *s)
case ',': case ',':
return gif_read_image(s); return gif_read_image(s);
case '!': case '!':
if (gif_read_extension(s) < 0) if ((ret = gif_read_extension(s)) < 0)
return -1; return ret;
break; break;
case ';': case ';':
/* end of image */ /* end of image */
default: default:
/* error or erroneous EOF */ /* error or erroneous EOF */
return -1; return AVERROR_INVALIDDATA;
} }
} }
return -1; return AVERROR_INVALIDDATA;
} }
static av_cold int gif_decode_init(AVCodecContext *avctx) static av_cold int gif_decode_init(AVCodecContext *avctx)
@@ -293,19 +294,19 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
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 = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
if (av_image_check_size(s->screen_width, s->screen_height, 0, avctx)) if ((ret = av_image_check_size(s->screen_width, s->screen_height, 0, avctx)) < 0)
return -1; return ret;
avcodec_set_dimensions(avctx, s->screen_width, s->screen_height); avcodec_set_dimensions(avctx, s->screen_width, s->screen_height);
if (s->picture.data[0]) if (s->picture.data[0])
avctx->release_buffer(avctx, &s->picture); avctx->release_buffer(avctx, &s->picture);
if (ff_get_buffer(avctx, &s->picture) < 0) { if ((ret = ff_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);