From patchwork Wed Jan 19 13:40:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33657 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4796795iog; Wed, 19 Jan 2022 05:41:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJzLAEGIjuU5Z9S9V+phrn5NbQkv1tnpQvbGRnkgg8OOdmcqaepfo+7LhZsSICnKDZEKWAg0 X-Received: by 2002:a17:906:c301:: with SMTP id s1mr24400618ejz.505.1642599705247; Wed, 19 Jan 2022 05:41:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642599705; cv=none; d=google.com; s=arc-20160816; b=oLphZWFkCqZ08/dOimZBJ6Xxz4GuPbK/DNmu5wYpclgjW6dOlDqA3IckwiiD9fGZ5p 1cZzSN02t7nGij9ieDBKAmrT1wpO0Q5TQ7gXM8QRV6PRz/BapPKdCGcINnUNaXLIhsrk kH2MBNOYx4iSG50sdLn6bPEwsXozoQiA87bYWb+9WMoTOyVI+Qs5ffY2a1ycywmNOnwU kRunKVViEXruZR2KOM2ZvfNkFjM7quDHtUHNW+FDFcbSq9khowR6Elj2HNrdfXfgOjtr CedbIpGiG44prA/WxT1GmfGBdj+KVOjkwYolNgEPmBefRCbrRBAQWQsPmByp/dXm9XxC KW9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=YYFOwuQD8x657OyXt8WfifKjii6sOMMKHVbQae+zJSc=; b=pmjAwnEJt6hKuUTPtFzGM7xwJogTnwmaLNeIJg7LkZOWzzp+X7VeCuCJIpQWW3QbTg EvAOz1n71a4KpgOZ3t0bhwSoFmTYPMwkrLcJbZEibsNk99d1IVSTsc6NF2MR76dZHip6 14+w28AWDJZchu41GaEn2JfsLJk9NaTv+EI0oexTTBRitpsVtwGR8f/DRpznpKl4NmJM /HXSukxYiOTvCVOwZtOiIuWi2G90pxtKTcLbSUKQR64fb3A/z4A5FvjwFh+Nr8TwkNq6 pWfuuNEZ5U13KpJM8UoxBxlDJWtfXNg/Umfhb5v9h1hEMf/DYjhrGXA9BSrGH+5M2YgF fxqQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i26si1844950eda.266.2022.01.19.05.41.44; Wed, 19 Jan 2022 05:41:45 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6EFD68B0B0; Wed, 19 Jan 2022 15:41:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4BC468B087 for ; Wed, 19 Jan 2022 15:41:30 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3C37524017C for ; Wed, 19 Jan 2022 14:41:30 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id QRSMWQuR6zNK for ; Wed, 19 Jan 2022 14:41:29 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id CCC2D240179 for ; Wed, 19 Jan 2022 14:41:29 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 9C3003A067C; Wed, 19 Jan 2022 14:41:29 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jan 2022 14:40:42 +0100 Message-Id: <20220119134040.774-2-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220119134040.774-1-anton@khirnov.net> References: <20220119134040.774-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavu/hwcontext_vulkan: clear dangling pointers on map failure 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xzd67s9jGKyz --- untested --- libavutil/hwcontext_vulkan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 60a6cf6a91..ae19fc2ab6 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -2927,6 +2927,7 @@ static int vulkan_map_from_drm(AVHWFramesContext *hwfc, AVFrame *dst, fail: vulkan_frame_free(hwfc->device_ctx->hwctx, (uint8_t *)f); + dst->data[0] = NULL; return err; }