From patchwork Tue Aug 25 14:09:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21909 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5CC9044B6CA for ; Tue, 25 Aug 2020 17:10:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F9F168AAEC; Tue, 25 Aug 2020 17:10:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6616468AA21 for ; Tue, 25 Aug 2020 17:10:10 +0300 (EEST) Received: by mail-ej1-f65.google.com with SMTP id a21so756842ejp.0 for ; Tue, 25 Aug 2020 07:10:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IKINuTiYn5JgCQkyyTzql8zimScL90SosvtnKNoPwTQ=; b=lo/86ECG0g0BCosBlZgQ2xjr2rm+E3xqFhckX9daaB6WXW/xWjifYKO+lH9AgERxyb Ta3WRJC5qmyh3cuYvlnNBZGttxos4qX/RHp6yd7MOpb8LjaVWl95ZBzZSdMW1VvwH3x9 KrimFEoJf8cIjj3Bcl1yDZQcXRXoj6Xa4Niaih40gGkERanMtuOaPvHHlM7Fq3FQ0Luc MKDEDZb9lhCEXoE25vvn/XbH3gU7/x3hNhVWPwOW/jN+yyoWTh8/X2toDPO8e++QfJ20 PbMAPFigQae0fZdGs6bht/kUFMIJpbbR/K8V/X7ddbIlaZvZJhWiDztfW7lkD+bBc4+H XNLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IKINuTiYn5JgCQkyyTzql8zimScL90SosvtnKNoPwTQ=; b=Iu51wB7Xdi9L8MetUhdHT9sg9ehODicyDhKN45DG9aqtS4P2ig7QFzJef5ffDLzxiL N35nJsKFmuP+RcXkHRsOpdNYEn09UZZH+nVC/dodnKPfF9flLciS6EhqAXO4dQFQgI85 7IFk2Hrn6ySq3Ly5pJcE1VfaC0dpTj1bRiZSeE9S2Bi4JySC56RBdUOf5BFnlDLMNfDB 3UjEVZ0uk92dNRXxcU8UQamUGroY9xjdziH+5xmfTdLTTtscGzAyw4rmXztm7UN2rq25 Lqd0ASAFZIx1ICNppEtZhB1Q2zg4PpJlR4kk3TljIWCl+ds+BOBLjBTK9qPJwQhgxqzf H+/g== X-Gm-Message-State: AOAM532bKXKUwY+5mxga4tCN4FmKjfWm9pGtLPtj2O3elzTjGDWD0DFs MiIOrg5WlwC9Q9danUFOFpWhYfHraPY= X-Google-Smtp-Source: ABdhPJyoSWy700RW/RMzIvAZRLsmwgwmxFTRuiwTQ3SxgOXupvHLN5eIh3FURXWrgBX4+JFa9Fds8A== X-Received: by 2002:a17:907:7094:: with SMTP id yj20mr10519953ejb.471.1598364609558; Tue, 25 Aug 2020 07:10:09 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id k25sm10169806edx.96.2020.08.25.07.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:10:08 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Aug 2020 16:09:12 +0200 Message-Id: <20200825140927.16433-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200825140927.16433-1-andreas.rheinhardt@gmail.com> References: <20200825140927.16433-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/19] avfilter/vf_premultiply: Fix leak of names of inpads X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- libavfilter/vf_premultiply.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) 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;