The deinit function in the 'error' section will correctly free
everything.
---
libavcodec/vc1dec.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 104c3a3..5c2cf9f 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -355,8 +355,11 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
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++)
- if (!(v->sr_rows[i >> 1][i & 1] = av_malloc(v->output_width)))
return -1;
+ for (i = 0; i < 4; i++) {
+ v->sr_rows[i >> 1][i & 1] = av_malloc(v->output_width);
+ if (!v->sr_rows[i >> 1][i & 1])
+ goto error;
+ }
}
if (!v->mv_type_mb_plane || !v->direct_mb_plane || !v->acpred_plane ||
!v->over_flags_plane ||
--
2.7.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
