mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-06 16:10:09 +02:00
vc1dec: wmv2dec: Validate ff_intrax8_common_init return value
This commit is contained in:
parent
0372e73f91
commit
d909f43b5c
@ -314,7 +314,7 @@ static void vc1_sprite_flush(AVCodecContext *avctx)
|
||||
av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
|
||||
{
|
||||
MpegEncContext *s = &v->s;
|
||||
int i;
|
||||
int i, ret = AVERROR(ENOMEM);
|
||||
int mb_height = FFALIGN(s->mb_height, 2);
|
||||
|
||||
/* Allocate mb bitplanes */
|
||||
@ -371,8 +371,6 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
|
||||
v->mv_f_next[0] = v->mv_f_next_base + s->b8_stride + 1;
|
||||
v->mv_f_next[1] = v->mv_f_next[0] + (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
|
||||
|
||||
ff_intrax8_common_init(&v->x8,s);
|
||||
|
||||
if (s->avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || s->avctx->codec_id == AV_CODEC_ID_VC1IMAGE) {
|
||||
for (i = 0; i < 4; i++) {
|
||||
v->sr_rows[i >> 1][i & 1] = av_malloc(v->output_width);
|
||||
@ -381,11 +379,15 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
|
||||
}
|
||||
}
|
||||
|
||||
ret = ff_intrax8_common_init(&v->x8, s);
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
ff_vc1_decode_end(s->avctx);
|
||||
return AVERROR(ENOMEM);
|
||||
return ret;
|
||||
}
|
||||
|
||||
av_cold void ff_vc1_init_transposed_scantables(VC1Context *v)
|
||||
|
@ -471,9 +471,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx)
|
||||
|
||||
ff_wmv2_common_init(w);
|
||||
|
||||
ff_intrax8_common_init(&w->x8, &w->s);
|
||||
|
||||
return 0;
|
||||
return ff_intrax8_common_init(&w->x8, &w->s);
|
||||
}
|
||||
|
||||
static av_cold int wmv2_decode_end(AVCodecContext *avctx)
|
||||
|
Loading…
Reference in New Issue
Block a user