[FFmpeg-devel] [PATCH 04/19] avfilter/vf_premultiply: Fix leak of names of inpads
Paul B Mahol
onemda at gmail.com
Wed Aug 26 23:20:38 EEST 2020
On 8/25/20, Andreas Rheinhardt <andreas.rheinhardt at gmail.com> wrote:
> These names leak because freeing them in the uninit function has been
> forgotten. Instead of adding the freeing code, this commit stops
> allocating these names. They are constants anyway.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> ---
> libavfilter/vf_premultiply.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
LGTM
> diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c
> index 1fef4777de..5d053b1f77 100644
> --- a/libavfilter/vf_premultiply.c
> +++ b/libavfilter/vf_premultiply.c
> @@ -673,27 +673,19 @@ static av_cold int init(AVFilterContext *ctx)
> s->inverse = 1;
>
> pad.type = AVMEDIA_TYPE_VIDEO;
> - pad.name = av_strdup("main");
> + pad.name = "main";
> pad.config_props = config_input;
> - if (!pad.name)
> - return AVERROR(ENOMEM);
>
> - if ((ret = ff_insert_inpad(ctx, 0, &pad)) < 0) {
> - av_freep(&pad.name);
> + if ((ret = ff_insert_inpad(ctx, 0, &pad)) < 0)
> return ret;
> - }
>
> if (!s->inplace) {
> pad.type = AVMEDIA_TYPE_VIDEO;
> - pad.name = av_strdup("alpha");
> + pad.name = "alpha";
> pad.config_props = NULL;
> - if (!pad.name)
> - return AVERROR(ENOMEM);
>
> - if ((ret = ff_insert_inpad(ctx, 1, &pad)) < 0) {
> - av_freep(&pad.name);
> + if ((ret = ff_insert_inpad(ctx, 1, &pad)) < 0)
> return ret;
> - }
> }
>
> return 0;
> --
> 2.20.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
More information about the ffmpeg-devel
mailing list