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.
Unified · Split
| @@ -111,6 +111,15 @@ static av_cold int init(AVFilterContext *ctx) · 110 unmodified lines | |||
| 111 | return 0; | 111 | return 0; |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | static av_cold void uninit(AVFilterContext *ctx) | ||
| 115 | { | ||
| 116 | AFormatContext *s = ctx->priv; | ||
| 117 | |||
| 118 | ff_formats_unref(&s->formats); | ||
| 119 | ff_formats_unref(&s->sample_rates); | ||
| 120 | ff_channel_layouts_unref(&s->channel_layouts); | ||
| 121 | } | ||
| 122 | |||
| 114 | static int query_formats(AVFilterContext *ctx) | 123 | static int query_formats(AVFilterContext *ctx) |
| 115 | { | 124 | { |
| 116 | AFormatContext *s = ctx->priv; | 125 | AFormatContext *s = ctx->priv; |
| @@ -118,14 +127,18 @@ static int query_formats(AVFilterContext *ctx) · 1 unmodified line | |||
| 118 | 127 | ||
| 119 | ret = ff_set_common_formats(ctx, s->formats ? s->formats : | 128 | ret = ff_set_common_formats(ctx, s->formats ? s->formats : |
| 120 | ff_all_formats(AVMEDIA_TYPE_AUDIO)); | 129 | ff_all_formats(AVMEDIA_TYPE_AUDIO)); |
| 130 | s->formats = NULL; | ||
| 121 | if (ret < 0) | 131 | if (ret < 0) |
| 122 | return ret; | 132 | return ret; |
| 123 | ret = ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates : | 133 | ret = ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates : |
| 124 | ff_all_samplerates()); | 134 | ff_all_samplerates()); |
| 135 | s->sample_rates = NULL; | ||
| 125 | if (ret < 0) | 136 | if (ret < 0) |
| 126 | return ret; | 137 | return ret; |
| 127 | return ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts : | 138 | ret = ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts : |
| 128 | ff_all_channel_counts()); | 139 | ff_all_channel_counts()); |
| 140 | s->channel_layouts = NULL; | ||
| 141 | return ret; | ||
| 129 | } | 142 | } |
| 130 | 143 | ||
| 131 | static const AVFilterPad avfilter_af_aformat_inputs[] = { | 144 | static const AVFilterPad avfilter_af_aformat_inputs[] = { |
| @@ -148,6 +161,7 @@ AVFilter ff_af_aformat = { · 16 unmodified lines | |||
| 148 | .name = "aformat", | 161 | .name = "aformat", |
| 149 | .description = NULL_IF_CONFIG_SMALL("Convert the input audio to one of the specified formats."), | 162 | .description = NULL_IF_CONFIG_SMALL("Convert the input audio to one of the specified formats."), |
| 150 | .init = init, | 163 | .init = init, |
| 164 | .uninit = uninit, | ||
| 151 | .query_formats = query_formats, | 165 | .query_formats = query_formats, |
| 152 | .priv_size = sizeof(AFormatContext), | 166 | .priv_size = sizeof(AFormatContext), |
| 153 | .priv_class = &aformat_class, | 167 | .priv_class = &aformat_class, |