diff options
author | Paul B Mahol <onemda@gmail.com> | 2017-08-25 09:50:57 +0200 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2017-08-25 09:50:57 +0200 |
commit | f39136b0a76e61d149bf50d287b2110273a8afa1 (patch) | |
tree | 49956658b1bdb3b34cc7d4c4341725190dbf1819 /libavfilter | |
parent | db5604ac26f06be34030c8ae8040c19d549280f1 (diff) | |
download | ffmpeg-f39136b0a76e61d149bf50d287b2110273a8afa1.tar.gz |
avfilter/af_merge: check ff_insert_inpad() for failure
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/af_amerge.c | 7 |
1 files changed, 5 insertions, 2 deletions
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; } |