From patchwork Mon May 25 08:16:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19844 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 05A4B44B849 for ; Mon, 25 May 2020 11:16:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D80AC688079; Mon, 25 May 2020 11:16:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E8EC6809F5 for ; Mon, 25 May 2020 11:16:49 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id p21so8369308pgm.13 for ; Mon, 25 May 2020 01:16:49 -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; bh=6adex62xlUF3vcgqVaarTTcfF6MY0aPuOsiyOq3hVk0=; b=mClBrOTAI8Gan/344QiQGHQmz+kSZ8fKZzvmz4yICmvl+SkYBhOuvQ0HTOB5lzW+XX jJTwnAqoCJjgHDVUkZ7U19eudcKjLx11xaJVGT6X9Uk3Ec92WgC/NGMrG9ryXXaTTV10 /TXgPWpa/6qaHXRWwofzLqa+1zE341e5rPojy33IktD/fkHhr29lOYYahxdz7AbJiYu6 66UlmPEOOXUZ58DDPUtAEf8K71+tdYdyhiyI5P7AU7CCooZVYmDX133xeu1LlFKBSP+j IodfA/WLNLAUmThPBPUWa+kjT5JBE5PndxfLs4YtJoIViF9YUmsEQa00bbX6ctKfuFX0 SBeA== 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; bh=6adex62xlUF3vcgqVaarTTcfF6MY0aPuOsiyOq3hVk0=; b=reqzGqfrD72W/heGMCRHr5FZgciEOjmAoFISfWEXRPjMhxRVAguhs3puwKhWRaX2DW +JIpmQe84JVmYDyGjGUbr4RcEvlYYI9v1NWHh+xCosLSa+2Ju7JFYd2HBMjzpdSFaxSa D6byfPb8aH3DvW4Vj6Y4GkFJ3EANY0b84c9zpeWvw9gf16NdAZskqr4PYFmB6xZa4J+q FDjX9DObOlpaX7bzvQErG+SPEsAWN2oZLWy4GA++PMNrEZaUSK6I8CCcZvLb9VtxcLrH +RJCk/H+Lip3SeP6xxRVdx5BthdZX+x2Xis1o19f9wrQjvcaLG3X4KLpT3V6a8uULCHs gtPQ== X-Gm-Message-State: AOAM530lkyVxns/gpNBlrwnyoUiV1MfIFBATqZBcFoQALUUsSIs1o5Y1 khO4DGbzRcOVPGuhS8iXbnUzSrlq X-Google-Smtp-Source: ABdhPJzPPSuRI3p3hh2sl2hu79n2UGOBPlcwL+ID5JO7AUEtuJKFhYWpSBDFwjmtqrnJjEMCtGaYOg== X-Received: by 2002:a62:1b53:: with SMTP id b80mr16252394pfb.145.1590394607098; Mon, 25 May 2020 01:16:47 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id lj12sm12472866pjb.21.2020.05.25.01.16.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 May 2020 01:16:46 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 May 2020 16:16:16 +0800 Message-Id: <1590394577-1502-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH v2 1/2] lavfi/afir: fix vpad.name leak 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Fix vpad.name leak in error path, move the vpad related operation only if enabled show IR frequency response. Signed-off-by: Jun Zhao --- libavfilter/af_afir.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index 7c7e845..5ba880f 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -876,6 +876,12 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); + ret = ff_insert_outpad(ctx, 0, &pad); + if (ret < 0) { + av_freep(&pad.name); + return ret; + } + if (s->response) { vpad = (AVFilterPad){ .name = av_strdup("filter_response"), @@ -884,15 +890,7 @@ static av_cold int init(AVFilterContext *ctx) }; if (!vpad.name) return AVERROR(ENOMEM); - } - ret = ff_insert_outpad(ctx, 0, &pad); - if (ret < 0) { - av_freep(&pad.name); - return ret; - } - - if (s->response) { ret = ff_insert_outpad(ctx, 1, &vpad); if (ret < 0) { av_freep(&vpad.name); From patchwork Mon May 25 08:16:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19845 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 87FC344ABC8 for ; Mon, 25 May 2020 11:45:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60706688083; Mon, 25 May 2020 11:45:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 165F168803E for ; Mon, 25 May 2020 11:45:27 +0300 (EEST) Received: by mail-pj1-f67.google.com with SMTP id nu7so8315930pjb.0 for ; Mon, 25 May 2020 01:45:26 -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; bh=qVtoX7SkVYswFA++3HyEVPMVhwAUSP2kEJ8oZYdkTiw=; b=HRwhSHYXjcjieyD5B/eSMRRjU1JXugNqBN/Y7Dlt1mKNV9WOmoFPJmuucr+h4mF1Fy g9M/CRMknWgbm0OKCYBJapHx73qyoGlAGs4vlAWxKYjfNqsyy59pVo1ehoJmIdZJ0gwW 2DnNLjo5+SJfEmk4MQGPwZVigj95MSRfRtAfxafdCLEwgujJxniuEQcFAOa8+yJN8mFo BARtjYuVxWLyO6n3pmpS43jN7dvEOswS8hjiQ0Di73m6t41HRkSSUdmWjYsNmbgM56sQ 3v7ogRCn9a4ghSG/KdYij8XuJLR47Vt0+TRrlbSEPxDWWPZWMF1A4eD1pGh758AwA7hp /zbA== 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; bh=qVtoX7SkVYswFA++3HyEVPMVhwAUSP2kEJ8oZYdkTiw=; b=LesocdCx0JbgXAiyIhVeiOlCgrwtzWG2mV58rkYHi8Fa/Qk+MUuXUipTZErH3p7cg+ leZil7L21KCNp0VdRjIHounMSQ16xECUt6aFSMM6FP6fl+9b0WCfioz4Ad7c3cQVI4Ru bW71c8BX4cd6q9YnNUDVGeU+6WBEcw2BL9ZS/r0tN2FBFoHXVy+9MoL/VccSnXG7JO3G FtEjyHzpOE6nboMZswLkbDl8ufO6rH8aT942lK5juWNSvfy+ZithETdgFlqm8DDokYns a2k5W1Vgd4SRmA9uM6M17L6s35HmTqELT0GZOJ5dKkDrQtJtHXvRo69/2LOc05BCU7Mw cItA== X-Gm-Message-State: AOAM531ORxKieaJqKqbkyR3X0nBNQYJd2P1ErOxXCsJw/XgJc1mL7uPp /WtO7GXgiOQqA7wlNkISoqNY5C3g X-Google-Smtp-Source: ABdhPJzrv3wJh/nB0mjJTwjhY3ZF074y0Ysbh9aNLLZnTVrQ7hbDVg6Wk6loppPPDvioP5EKi+Bojg== X-Received: by 2002:a17:902:a505:: with SMTP id s5mr26831867plq.20.1590394610242; Mon, 25 May 2020 01:16:50 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id lj12sm12472866pjb.21.2020.05.25.01.16.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 May 2020 01:16:49 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 May 2020 16:16:17 +0800 Message-Id: <1590394577-1502-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590394577-1502-1-git-send-email-mypopydev@gmail.com> References: <1590394577-1502-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] lavfi/aiir: Refine the pad/vpad related operation 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao move the pad/vpad related operation with more natural coding style. Signed-off-by: Jun Zhao --- libavfilter/af_aiir.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index 92ff348..7971cf2 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -1153,6 +1153,10 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); + ret = ff_insert_outpad(ctx, 0, &pad); + if (ret < 0) + return ret; + if (s->response) { vpad = (AVFilterPad){ .name = av_strdup("filter_response"), @@ -1161,13 +1165,7 @@ static av_cold int init(AVFilterContext *ctx) }; if (!vpad.name) return AVERROR(ENOMEM); - } - ret = ff_insert_outpad(ctx, 0, &pad); - if (ret < 0) - return ret; - - if (s->response) { ret = ff_insert_outpad(ctx, 1, &vpad); if (ret < 0) return ret;