har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/af_aformat: Add uninit function

Browse Source 
Fixes memleaks in case init fails (e.g. because of invalid parameters
like 'aformat=sample_fmts=s16:cl=wtf') or also if query_formats is never
called.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-08-09 16:42:37 +02:00
parent eaa6c08f35
commit a7bd379276
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/af_aformat.c
View File

@ -111,6 +111,15 @@ static av_cold int init(AVFilterContext *ctx)
return 0; return 0;
} }
static av_cold void uninit(AVFilterContext *ctx)
{
AFormatContext *s = ctx->priv;
ff_formats_unref(&s->formats);
ff_formats_unref(&s->sample_rates);
ff_channel_layouts_unref(&s->channel_layouts);
}
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)
{ {
AFormatContext *s = ctx->priv; AFormatContext *s = ctx->priv;
@ -118,14 +127,18 @@ static int query_formats(AVFilterContext *ctx)
ret = ff_set_common_formats(ctx, s->formats ? s->formats : ret = ff_set_common_formats(ctx, s->formats ? s->formats :
ff_all_formats(AVMEDIA_TYPE_AUDIO)); ff_all_formats(AVMEDIA_TYPE_AUDIO));
s->formats = NULL;
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates : ret = ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates :
ff_all_samplerates()); ff_all_samplerates());
s->sample_rates = NULL;
if (ret < 0) if (ret < 0)
return ret; return ret;
return ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts : ret = ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts :
ff_all_channel_counts()); ff_all_channel_counts());
s->channel_layouts = NULL;
return ret;
} }
static const AVFilterPad avfilter_af_aformat_inputs[] = { static const AVFilterPad avfilter_af_aformat_inputs[] = {
@ -148,6 +161,7 @@ AVFilter ff_af_aformat = {
.name = "aformat", .name = "aformat",
.description = NULL_IF_CONFIG_SMALL("Convert the input audio to one of the specified formats."), .description = NULL_IF_CONFIG_SMALL("Convert the input audio to one of the specified formats."),
.init = init, .init = init,
.uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
.priv_size = sizeof(AFormatContext), .priv_size = sizeof(AFormatContext),
.priv_class = &aformat_class, .priv_class = &aformat_class,