From patchwork Wed Jan 19 13:40:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33656 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4796680iog; Wed, 19 Jan 2022 05:41:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzThJkvu+fuX10MtEMCrSaR4xzWUBxaDIQ+uJ9wO8OV8mDe8wS2J5E0/Uv2rd6qMDhNNBLm X-Received: by 2002:a17:906:7315:: with SMTP id di21mr23921505ejc.700.1642599695743; Wed, 19 Jan 2022 05:41:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642599695; cv=none; d=google.com; s=arc-20160816; b=gCcb61PrzC6v6YrWU4+vW+WFFE5//zylSJtUdnp4JeplHOmwWWEFoOB6DAKyR1eEX0 GWoMjjkOODV04hhaIuPQU5CcII03m7Poghlpuz5DNgWo6ISfCNpKgkbM3HQwAlTMhlrw 8f51UPM8+L/J1iTdMS9zzcNq4O7Be+I3uawdNS5CxeHEvwX1Z0PsCNtEgFjfPGeJc3Y8 E+0MHMuTnQvO5hBy6ouKHghCLsb4Td8hk1OZ+ernFR4VHdnhwLJxhdjNPqyWUhm/rvWk 4D0jdssCy5wsIusb65EfhLqtiwh3n/zC8Nl2pUfgaP1aNUzpqOM6vA/hnQKAjtibth5v TcKg== 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:message-id:date:to:from :delivered-to; bh=eFwxWReb9Y066TBoorecSFW4teUvffMv5n6TW+jO6jg=; b=eVzoG3ExW1DzCEW1hW8Kd1nzAKW9Rqa2zmyIe0U5Ir9fNayg2JRI0wiFVzFrjMAcjw sm6/bBwLm9SEkUmb45pEL6EdOPqEu5CgKy7Ex2XxTOg5Ui9B1V8fV/n793j7RjTEezMM C5SN7XlxwQx1RYHA+snXAAGcXTnqYRFkq7oWnAcMGeV4ssQFnZXEUQ7NTcX4f6v96XFX +zjpJ6jUxGXmsGLtsooKxv3VkOsrxLObiXXPaQ0k2MmtwoFY4whJU3YoC72CGBeEVgaC Aru1hXhE0qm28A/RSkXEXuqO2r01EtHhECfipKAfr+LX2DpwS+bWoPNNn8eB468jkk5I GX8Q== 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 gv2si4975994ejc.466.2022.01.19.05.41.34; Wed, 19 Jan 2022 05:41:35 -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 9ACB968B097; Wed, 19 Jan 2022 15:41:31 +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 C6E7A68AFF0 for ; Wed, 19 Jan 2022 15:41:24 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2B0EC24017C for ; Wed, 19 Jan 2022 14:41:24 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id U4TtuFZAslzd for ; Wed, 19 Jan 2022 14:41:22 +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 E9A12240179 for ; Wed, 19 Jan 2022 14:41:22 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id DC3953A067C; Wed, 19 Jan 2022 14:41:22 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jan 2022 14:40:40 +0100 Message-Id: <20220119134040.774-1-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavu/hwcontext_opencl: 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: YqOtSSfPKKJY --- untested --- libavutil/hwcontext_opencl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 26a3a24593..40ee611943 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -2146,6 +2146,7 @@ fail: clReleaseMemObject(mapping->frame.planes[p]); } av_free(mapping); + memset(dst->data, 0, sizeof(dst->data)); return err; } @@ -2317,6 +2318,7 @@ fail: if (desc->planes[p]) clReleaseMemObject(desc->planes[p]); av_freep(&desc); + memset(dst->data, 0, sizeof(dst->data)); return err; } @@ -2407,6 +2409,7 @@ fail: 0, NULL, &event); if (cle == CL_SUCCESS) opencl_wait_events(dst_fc, &event, 1); + memset(dst->data, 0, sizeof(dst->data)); return err; } @@ -2562,6 +2565,7 @@ fail: 0, NULL, &event); if (cle == CL_SUCCESS) opencl_wait_events(dst_fc, &event, 1); + memset(dst->data, 0, sizeof(dst->data)); return err; } @@ -2793,6 +2797,7 @@ fail: clReleaseMemObject(mapping->object_buffers[i]); } av_free(mapping); + memset(dst->data, 0, sizeof(dst->data)); return err; }