From patchwork Sun Aug 9 15:57:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21558 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 C30C644B9EE for ; Sun, 9 Aug 2020 18:58:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF09F68AA6B; Sun, 9 Aug 2020 18:58:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8E4668A8E9 for ; Sun, 9 Aug 2020 18:58:32 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id kq25so6999040ejb.3 for ; Sun, 09 Aug 2020 08:58:32 -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=lGKrGOklLPCveUdtTEXHmWOhd+GfUW98+i6TqWDJiyw=; b=Vo7LLx0jyAySQwy450r8F0FqAVLLJNDhRtC0S/Eb5DRtXRWvbsJjI1/CVnru/P5fzN UOEMhzAj0lwL5Bxtx+0HFm6zHVFWi6N++kOHK4HNv+fjLu6tZG6UziehlmGMDvWD0Wkp T7/BSLHOyvxUXHVZp92wBE3Xc8UCOQMvjTSdebAu4SZc+Xfv6JCHfoOdgDGObqxuHFZu jphzKpFdi0YF2hrXvN8JG5HXSju0/U8itCB7M27uEtajRyqp4YdmiscyG4IwawTgBr3F gMWHU+OXuMPQL2rtFV1sBf0+ZiXKXa+O3vZZ07CmMsTAmDkuBlT9FFqhEMP0qwDjujyB CfxQ== 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=lGKrGOklLPCveUdtTEXHmWOhd+GfUW98+i6TqWDJiyw=; b=EzItFHeE6HApdECRqBx7DW8K9/K+XA4v7ndw0MifoFvDRjEOazeDVmkwHDCZT2kvPR WlE7d2a8nK07oLfxr6vgm9D9KbVGIqxsRNZ9OYddDUQw4As74X0D+xMrRwHx+gZx1uuJ I4IRaZOfVYfhxgjUFQpafhYMzn12govBLkMcWZeuQBYxW1ym34Y9FmfwRtVo43BsFp77 ps0AaZVl0fUO6UiEQW5tdjQRIux1Tj76dXl9CmVTZuU+5m9+FGB3O8gCbdJgJXyTpkmV pKGL6bbdU4/fLlsCrhtMWzYddrkVH0ls4lwlWoBsGxiYhrrIZQ0c0QG1NKEiFskz1i0d /yIQ== X-Gm-Message-State: AOAM53153BKHNF7PWfaLV0bMQgcYHUCUZxSRkqiom8uYMk18v36MJW1p tcP0mTtAJYKvJDUfezcm+XHet6PN X-Google-Smtp-Source: ABdhPJyLq7ZEVLI+MR1kUR55jjdpOdsonft4uQK/zrwH1goYmGji/pvp1fwvs62NYJK5S29XmE+kTg== X-Received: by 2002:a17:906:6406:: with SMTP id d6mr17618569ejm.30.1596988711740; Sun, 09 Aug 2020 08:58:31 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id g11sm5360290edv.95.2020.08.09.08.58.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2020 08:58:31 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Aug 2020 17:57:45 +0200 Message-Id: <20200809155748.30092-12-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200808140202.586-1-andreas.rheinhardt@gmail.com> References: <20200808140202.586-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/21] avfilter/vf_hwdownload: Fix leak of formats list upon error 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" Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_hwdownload.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_hwdownload.c b/libavfilter/vf_hwdownload.c index 33af30cf40..ce10b60e59 100644 --- a/libavfilter/vf_hwdownload.c +++ b/libavfilter/vf_hwdownload.c @@ -55,11 +55,11 @@ static int hwdownload_query_formats(AVFilterContext *avctx) } } - if ((err = ff_formats_ref(infmts, &avctx->inputs[0]->out_formats)) < 0 || - (err = ff_formats_ref(outfmts, &avctx->outputs[0]->in_formats)) < 0) + if ((err = ff_formats_ref(infmts, &avctx->inputs[0]->out_formats)) < 0) { + ff_formats_unref(&outfmts); return err; - - return 0; + } + return ff_formats_ref(outfmts, &avctx->outputs[0]->in_formats); } static int hwdownload_config_input(AVFilterLink *inlink)