From f39136b0a76e61d149bf50d287b2110273a8afa1 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 25 Aug 2017 09:50:57 +0200 Subject: avfilter/af_merge: check ff_insert_inpad() for failure Signed-off-by: Paul B Mahol --- libavfilter/af_amerge.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index cc974cdb7f..09c660ef49 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -322,7 +322,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) static av_cold int init(AVFilterContext *ctx) { AMergeContext *s = ctx->priv; - int i; + int i, ret; s->in = av_calloc(s->nb_inputs, sizeof(*s->in)); if (!s->in) @@ -336,7 +336,10 @@ static av_cold int init(AVFilterContext *ctx) }; if (!name) return AVERROR(ENOMEM); - ff_insert_inpad(ctx, i, &pad); + if ((ret = ff_insert_inpad(ctx, i, &pad)) < 0) { + av_freep(&pad.name); + return ret; + } } return 0; } -- cgit v1.2.3