From patchwork Fri Jun 2 09:42:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 41958 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp1102189pzb; Fri, 2 Jun 2023 02:43:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5pvNE/sz2ml9qxxwpnGRuGH+awSOmUhKRYlyVYsOKDXv4qmJdzP1MgL8FOm4eHHRlwSq97 X-Received: by 2002:a17:906:fe43:b0:973:e69d:c720 with SMTP id wz3-20020a170906fe4300b00973e69dc720mr9609417ejb.51.1685698984274; Fri, 02 Jun 2023 02:43:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685698984; cv=none; d=google.com; s=arc-20160816; b=Bb2GWPRU9oN9NQmLwcBU/M8keevMJbl61Q/0eKZA8bAiB4cq3gTmLgWLGiWZy56uuX 6KYLCBSGN68dy8AtGiKk7sYZyqb1OGKuMQa61JpqlvtaS9TpAxOKiAo1uUtenbfKQLQW Zosm5zQ6osbSi2KljwqW35XbdPts+TTCNRVPqEdRMbZw5RiJYEbeDHJTxwtxpCYidP/c DLb21n3YQ3KMSCXmXsaHi1EexU9DsA9wFyrySQWBV4W0pydaTRLG4AXziFwBLDFvkRsc DsxFvQjwApZWFbRFMeR8jUldCRsm0uMTvy9srooOirklwZ2H/gyYRs6BkohwIDKgPpc7 0IFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=lDVbBYTqupRR0SU0nyTfFGCRJAAHE+X4TUov+MHMP3o=; b=J/RX6iZnjjbO9L2kvA2T+jP1sEz+1I/ATU4Cb1Ge4SNotHURHun8FK0g1vx7SnSeRg YacphMtvZqHwm5hVgK7Y7RGUx+phoHGxSQ5+d9mtvntgFF9iDAXuXjrQa5phFJe7ZEjB /roO8rw7WiK0T1WxfmNWDP7DkVG/Urg8kUVXQGyQnbeHkIbZAXIoBNqKo5NM5c9Yo/Jx vorUysygMnt8SeD0hnKsoWVQ82wKIcFHWv2Od9/hIWp0cHmPy4oCRUj0nX2rLysGNYco TVgD0eflVJOl3reDRQdxbfYNa3F4WP5EmeWYuDNcSBq2YRc8k7OtPYrj+hFcDJjT9sw8 9sxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=U3yJjTbT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s11-20020a1709067b8b00b0094a99b59877si547469ejo.712.2023.06.02.02.43.03; Fri, 02 Jun 2023 02:43:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=U3yJjTbT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 815DB68BF79; Fri, 2 Jun 2023 12:42:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 364666802E2 for ; Fri, 2 Jun 2023 12:42:53 +0300 (EEST) Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-96fdc081cb3so257786266b.2 for ; Fri, 02 Jun 2023 02:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685698972; x=1688290972; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vS/ZHwIt3oBDzjmQd7gIcbCRqz3Pe4sGnXmcgs4wSEI=; b=U3yJjTbTynGmHPyNxhKhEAqrgF0FKRmq16eyMaIK78DxD/39FU0mP/I0IxRm1r6lsu MUs5NVcTK4xhEvF5oQjLPD/4rh1mnN6jACmbOkQCHS8oayjF/VmbjUu2+9nx3Z0esnbi wzyZYkmyGEYCgREyEVHmb3FAb/VR8JZhETSeL9WqIe4VbN0gKUSb8AZulE6MWcZ+YQ44 6UmaRDS92cuFjn740dAupHqdVzhXFcNtW4g9wYEiWBJs6Zj12ozYkgrDkQH7Rc5TiXGT fOuFHdtE/CqBkX0RfpecJq/+AXaLqCxlBc6g8LMqiSg8IZ0f6IpTlyhp3rgxA4S5yGlZ rfmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685698972; x=1688290972; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vS/ZHwIt3oBDzjmQd7gIcbCRqz3Pe4sGnXmcgs4wSEI=; b=MFk4/T4I2VgNCHM8CKlncG2RrJm1rFWJrtS9ouuY0DwyYyXi1NVz3PGBzRznS2zTTJ 2jZalmPvy5VAAxRPdn2a3dEnRLQxLKt4wO7mE9iL1gpTf1t4+04pWx1qjezwrV5X83cI JTjvMIL51B96WsSwL4dkXdLcvEv9ct809x8zr1kC+WFNj7eJnttbmJzwjXDD/8cyhLs0 wWXuTk9+sElMRbH6W/XEiFSqfRVmE6HfDpuLMTg7CqvYJvMBgMbSsWGi2CQSRgnakt7B mxGXt+8/DoTjItcejej2/8VT6OI2fQ2y7FVqOCEtvjxJEJ111t7fvmVnN2CRFcU8MCtP Cf7w== X-Gm-Message-State: AC+VfDyCfZcQgyCp4IAK+o1D+ZOjxCVqv1HPft9ydk1faDUj+OEwTI9k YFtZ0THfV8yXwO7euj56pNmGtZSN+oU= X-Received: by 2002:a17:907:6da4:b0:96f:7b4a:2904 with SMTP id sb36-20020a1709076da400b0096f7b4a2904mr11244546ejc.3.1685698972120; Fri, 02 Jun 2023 02:42:52 -0700 (PDT) Received: from MBP-von-Marvin.fritz.box (dynamic-2a01-0c22-ac94-0c00-3402-3f08-eca5-63f7.c22.pool.telefonica.de. [2a01:c22:ac94:c00:3402:3f08:eca5:63f7]) by smtp.gmail.com with ESMTPSA id j9-20020aa7c409000000b0050dfd7de30dsm472641edq.94.2023.06.02.02.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jun 2023 02:42:51 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jun 2023 11:42:46 +0200 Message-Id: <20230602094246.3596-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavfi/vf_blend_vulkan: fix leak on error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AOee3bt8sMIR --- libavfilter/vf_blend_vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_blend_vulkan.c b/libavfilter/vf_blend_vulkan.c index 530f4981c2..717efcee41 100644 --- a/libavfilter/vf_blend_vulkan.c +++ b/libavfilter/vf_blend_vulkan.c @@ -249,7 +249,8 @@ static int blend_frame(FFFrameSync *fs) if (top_fc->sw_format != bottom_fc->sw_format) { av_log(avctx, AV_LOG_ERROR, "Currently the sw format of the bottom video need to match the top!\n"); - return AVERROR(EINVAL); + err = AVERROR(EINVAL); + goto fail; } RET(init_filter(avctx)); }