From patchwork Sun Feb 9 18:40:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17737 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 A58C8447EDF for ; Sun, 9 Feb 2020 20:40:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AB5368A69C; Sun, 9 Feb 2020 20:40:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9C52689DBD for ; Sun, 9 Feb 2020 20:40:43 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id z3so4818836wru.3 for ; Sun, 09 Feb 2020 10:40:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jTGFLQM3aOf/PeYdgwtoAD02GXzC2vIzLfFSZozanmg=; b=OzgLB559/laXbz/yPvHv+LhoxrMRYH046aFda2MnKqY4dxoGe5j9uAqQpx8Nl5cBw9 34DyaZrU2mWg964RrSFuqW1eXjn67xCZARfHjbDtuKL04+xdpttx6eEx7znjVl01FRH3 6XjAG8RO5meHQ2PL1/h7DptsAgd/ChV9939RLH7Qb3b4BX/1gvKOMXT+2D/cxWnDmz03 fLxmH1+W0KptKtASSpKXWeCDAE6FVCUL484ha5RC+yW5vDY1zYUU0MiRb1D9f8Oi1l0F qEf5Hs1Vh2GanMLqdbIAwEG41jUNc5ajYcdmgmhLOEJIOyS63jcv9b5AHEzSGWATq4Cq J3EQ== 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:mime-version :content-transfer-encoding; bh=jTGFLQM3aOf/PeYdgwtoAD02GXzC2vIzLfFSZozanmg=; b=je5o+LOJTuA9qaNcM+zTwjYTxioSczbY5pr3+CuboGLqOq+Ilg8dAW+FTfBLQz4U+Y YQOHsYc48ui9famzojXDfXgtB3kNS7V59wVnDwJul7CeVOVEimiV2PpEkJpudUa1s6ol ItJxrgLR4jI2pDdF4kLF4FBghi1Wss1tI7oIJAxLxWlzYpPzxEDD3vbsfpN6bpK/iVEa XreEWYznk2SFkJ76GD7QgB0XYBaV3HeXeYhWj+Tr9mA2wf4YR4Uf+fGx/EFko+iY1fbF ad0j6kTI9ecpScuUBFMssBOP89JeEfIJayWhgL2Epv+lux3eoQk/fWLs5h4PjdJ3ih8K WAHA== X-Gm-Message-State: APjAAAU0b4+BjWYergsj2+7gXw41IIU/0/j1BkNmLzZZoI0PKGD1bpnK jEiuXWQzlmgrJLTPfBdol7SbvoYE X-Google-Smtp-Source: APXvYqx4sKqc7x7lIoIxivH+QJ9njTVu30XMdxP8LQQayYExF1d5LBLmMLHVky8NmOOfr/6a/f9cZw== X-Received: by 2002:a5d:6802:: with SMTP id w2mr11986703wru.353.1581273642809; Sun, 09 Feb 2020 10:40:42 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id 21sm11882137wmo.8.2020.02.09.10.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2020 10:40:42 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Feb 2020 19:40:34 +0100 Message-Id: <20200209184034.29524-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_dedot: Fix leak of AVFrame if making it writable fails 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" Even in this scenario, the frame still contains references to data that won't be freed if the frame isn't unreferenced. And the AVFrame itself will leak, too. Fixes Coverity issue #1441422. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_dedot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_dedot.c b/libavfilter/vf_dedot.c index 1fb7bfe866..993ac8f74f 100644 --- a/libavfilter/vf_dedot.c +++ b/libavfilter/vf_dedot.c @@ -313,7 +313,8 @@ static int activate(AVFilterContext *ctx) FFMIN(s->planeheight[2], ff_filter_get_nb_threads(ctx))); } - } + } else + av_frame_free(&out); } else if (!out) { ret = AVERROR(ENOMEM); }