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

avcodec/vc1dec: propagate errors from vc1_parse_sprites()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-14 01:07:34 +01:00
parent 5f00b333a4
commit 48016f8feb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/vc1dec.c
View File

@ -5288,7 +5288,7 @@ static void vc1_sprite_parse_transform(GetBitContext* gb, int c[7])
c[6] = 1 << 16; c[6] = 1 << 16;
} }
static void vc1_parse_sprites(VC1Context *v, GetBitContext* gb, SpriteData* sd) static int vc1_parse_sprites(VC1Context *v, GetBitContext* gb, SpriteData* sd)
{ {
AVCodecContext *avctx = v->s.avctx; AVCodecContext *avctx = v->s.avctx;
int sprite, i; int sprite, i;
@ -5332,7 +5332,7 @@ static void vc1_parse_sprites(VC1Context *v, GetBitContext* gb, SpriteData* sd)
sd->effect_pcount2 = get_bits(gb, 16); sd->effect_pcount2 = get_bits(gb, 16);
if (sd->effect_pcount2 > 10) { if (sd->effect_pcount2 > 10) {
av_log(avctx, AV_LOG_ERROR, "Too many effect parameters\n"); av_log(avctx, AV_LOG_ERROR, "Too many effect parameters\n");
return; return AVERROR_INVALIDDATA;
} else if (sd->effect_pcount2) { } else if (sd->effect_pcount2) {
i = -1; i = -1;
av_log(avctx, AV_LOG_DEBUG, "Effect params 2: "); av_log(avctx, AV_LOG_DEBUG, "Effect params 2: ");
@ -5349,10 +5349,14 @@ static void vc1_parse_sprites(VC1Context *v, GetBitContext* gb, SpriteData* sd)
av_log(avctx, AV_LOG_DEBUG, "Effect flag set\n"); av_log(avctx, AV_LOG_DEBUG, "Effect flag set\n");
if (get_bits_count(gb) >= gb->size_in_bits + if (get_bits_count(gb) >= gb->size_in_bits +
(avctx->codec_id == AV_CODEC_ID_WMV3IMAGE ? 64 : 0)) (avctx->codec_id == AV_CODEC_ID_WMV3IMAGE ? 64 : 0)) {
av_log(avctx, AV_LOG_ERROR, "Buffer overrun\n"); av_log(avctx, AV_LOG_ERROR, "Buffer overrun\n");
return AVERROR_INVALIDDATA;
}
if (get_bits_count(gb) < gb->size_in_bits - 8) if (get_bits_count(gb) < gb->size_in_bits - 8)
av_log(avctx, AV_LOG_WARNING, "Buffer not fully read\n"); av_log(avctx, AV_LOG_WARNING, "Buffer not fully read\n");
return 0;
} }
static void vc1_draw_sprites(VC1Context *v, SpriteData* sd) static void vc1_draw_sprites(VC1Context *v, SpriteData* sd)
@ -5461,7 +5465,9 @@ static int vc1_decode_sprites(VC1Context *v, GetBitContext* gb)
memset(&sd, 0, sizeof(sd)); memset(&sd, 0, sizeof(sd));
vc1_parse_sprites(v, gb, &sd); ret = vc1_parse_sprites(v, gb, &sd);
if (ret < 0)
return ret;
if (!s->current_picture.f.data[0]) { if (!s->current_picture.f.data[0]) {
av_log(avctx, AV_LOG_ERROR, "Got no sprites\n"); av_log(avctx, AV_LOG_ERROR, "Got no sprites\n");