From patchwork Mon Aug 19 13:01:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 14584 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 4B46D447E2D for ; Mon, 19 Aug 2019 16:08:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35F4968AACE; Mon, 19 Aug 2019 16:08:22 +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 A5D3368A8E2 for ; Mon, 19 Aug 2019 16:08:14 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id e11so1204076pga.5 for ; Mon, 19 Aug 2019 06:08:14 -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=jLc19s6xmmx9GEHU0zkB0CODiI9c5DuPG4Utzh8DP0Y=; b=VRs/hrvLZe7ypXG6xoiHXIuucqVb70La9iIxD10XDqnCB+K7zH227PnXi5Sif6S8zR oPFMEs03ryQ/HBcWnSLhYN9UVFntD34rEugwZp/GSMYyZI61DzPAA7Zvi5Jy9iYtEgaQ 74P5ILZeEcx+nyzL/GAtkQR7f70pcquyWEIThKZ8VHeDBpkmzh71D53fJTr9WJbIfeDS +a8Gzpic2+Vd1boKd4u1dro7/l8OQCOGdYtpSXFFQY5VOMoTcFV7krWg57e6ytkosSCr MIUbfKsLuosGfpA3XFG6xTw+fg5Cgig2vdNqqvnly7jGLjOtfTpESmMdwdK9WuMlKalb natQ== 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=jLc19s6xmmx9GEHU0zkB0CODiI9c5DuPG4Utzh8DP0Y=; b=SrdCW+bzslrUHhSceZmi3jAublbBWF8KP6XR0eBndlGF5UVUjtU4KwlpvJpO2snNaG acmpwBUoMD+oRt+/K+sIRUONgKfukVaPVlohDDiPOF5D2cAf6sxmP1gTk0g+CpiGKy1P PNMo8jvPI7l6EOQuGHqK83+p1RmfDw1mJ7o/htd5lHbXG2f7EtqWzL/Iko9Of2QtLpeO 4/oeKa8DAQE6dXaXAdW8AXHjcWCifWAx9B3lH2M0z/sZcpdsm7TcZdUCx2vOFqTLpHa2 XxVE0bLjbzA1Fk7RFg1fdqiXWVU+TE9cSCUzTvKa39RS0S7Xdu84BDhowhp1C1rqQ72O vthQ== X-Gm-Message-State: APjAAAUskEJckL8Ckt5hTaTU8NhnZbhJNu4RPa/KiStOuI9WDNgL9WoS ZCFFiUSX+ZdLBh4hRN+UMfsbtI8t X-Google-Smtp-Source: APXvYqxj3QxTJW3FYfAK0f3g/5egp7y/lzWYRmoMSfooJ+zLnD3YCswSkmUBO6FVh6067rpn4VLYQQ== X-Received: by 2002:aa7:9393:: with SMTP id t19mr23096870pfe.12.1566219672769; Mon, 19 Aug 2019 06:01:12 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s125sm20865656pfc.133.2019.08.19.06.01.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Aug 2019 06:01:12 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Aug 2019 21:01:03 +0800 Message-Id: <1566219667-22805-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1 1/5] lavfi/af_adeclick: fix double free after ff_filter_frame fail 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 ff_filter_frame fail will free the frame, so we just returen after this function fail. Signed-off-by: Jun Zhao --- libavfilter/af_adeclick.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavfilter/af_adeclick.c b/libavfilter/af_adeclick.c index 50eef74..2c42f97 100644 --- a/libavfilter/af_adeclick.c +++ b/libavfilter/af_adeclick.c @@ -592,7 +592,7 @@ static int filter_frame(AVFilterLink *inlink) ret = ff_filter_frame(outlink, out); if (ret < 0) - goto fail; + return ret; if (s->samples_left > 0) { s->samples_left -= s->hop_size;