From patchwork Tue Oct 5 20:53:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30912 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5776553iob; Tue, 5 Oct 2021 13:54:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvxfUluphq4Zd7G7C49UFw5KOsRLYWuf0q5FT+jcSp+YI/0tkTf8NgEK77bxSzrM/5ZvSr X-Received: by 2002:a17:906:660b:: with SMTP id b11mr27243219ejp.427.1633467295717; Tue, 05 Oct 2021 13:54:55 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z7si6256936ejn.598.2021.10.05.13.54.55; Tue, 05 Oct 2021 13:54:55 -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=@outlook.com header.s=selector1 header.b=SK5itRTC; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD87B68AA49; Tue, 5 Oct 2021 23:54:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072058.outbound.protection.outlook.com [40.92.72.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 845EC68A9D3 for ; Tue, 5 Oct 2021 23:54:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K44z15+yuSdFYTI6CRYFgzkrn0/mMyM837RNyhYMWo0erad6iwWFSAw20szmwbuxsmUO9rrQItjiw6Z+ruCITbqj+v7CQ8Q4fhCsdoZguJL1bEUhDGNrDb0HitNQHLxCKsg9IeUfGth9AU2QcwQ6Qpqnzg69v+IXB2UTFbjFm/8xV+HRaDgxb7Akx8CmO8DPgr+61fDtvp2RytoE1uCdgG7MrHhGbIfUla7KMxnG6tELWfCHMWg1uLGDwGRjxJc0nNxEv9x0LugLr5jQeyEjK+Gy6DoRzyxe9+TSvU7SgDfhXLaXguWkrFb1L3bhDgmwh/fE5/BBDscDs2gKcHqZBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ux+FTowt/nL85N6JrFMuVKf0A0T2eYIn4E01IZ1vByg=; b=jMCGekrkQDEPPO8O4GdohfCyhz5vTI6fPm7q+XqRziL6952+uJoi/QFOhY1d8Vw+GD4O4FKyVbPwDkPFN7+BuBnzJMSvb3QPs6LNvugEr9tV4vefK67+Ft2tGncy7G6TUlQLHmVdBrZH/UNlLL8K+Qne2uJtk3c73GMK6givp6RAghHmLbF7CN+YNSFuS6DEJ/LBJRTyi3Z3SldnxFG3Q4sYwmWDBpZ3mEUIM+QjbEIP3g+LIDJwqZ/OvEljZclxYff/fPAngvGVTYH2IZxxAExHmkV3q4LGK4BCMFkn8HTd1hlb7Ad5Uyw5tz8MShRTNUDvNXN6G4wemIe4dhePoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ux+FTowt/nL85N6JrFMuVKf0A0T2eYIn4E01IZ1vByg=; b=SK5itRTCGHkQDZACMHNbbVGN1ii4Cduyn8c67OUGHpQGFMcBf6aUc6CmwTerWUTPiz3I3sJy6Yd8RIHG4NqxEje+tJ+Zr5i3keYhI1p9p7xlj+FvTXc4fJ6YEToFYOcJuytf++xyITW7fC2BA3m5mh8nF8u0pgN+0ZqhbMGCe9/tFnuNPyNdM7Y/ujuInyOv62eNW6dOTNkEnoX8ApflY7LGZ2I22fgs0S/jS3+fya3Tz8pICg8UP61sO+jIoJ/IMje2Fzhgd2Br2Ib7UbQhzAdMnuZI7SVVWdYV2FC4TM3Ran6a5dkxzZom63W2Jr08cKwJFVEB8Ji7/t+mzmAzNg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6184.eurprd03.prod.outlook.com (2603:10a6:20b:141::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Tue, 5 Oct 2021 20:54:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Tue, 5 Oct 2021 20:54:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:53:47 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [acTKdgJYYwtiBEgflQmq8DnZOclhmUun] X-ClientProxiedBy: AM4PR0701CA0040.eurprd07.prod.outlook.com (2603:10a6:200:42::50) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211005205348.519944-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0701CA0040.eurprd07.prod.outlook.com (2603:10a6:200:42::50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Tue, 5 Oct 2021 20:54:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77b5f417-5c42-4866-4106-08d98842450b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS+KSxcjYi+gKEA6YP+MkHedYnsbry6fsAm96t49v7/EUHXyTINc89UqQtn6el9tybfqbuFtTllrSpdgWr96FfTQlLnOMhRxV9MSrDpwnCQkueYzi1VdR1E0KhvEUvMDKsDxiu8KIjkbxRw9bJLIg4IXnlCeucDreNtuH/CFCITdLZ3E+4jf+UxC4B5oq5wuvQTUhPzRk+oJStB31ktvdx1yMtr6cCVW/t4cdd8vLFVI3bF76yrRJSx8PugCFHA5Ea5YVjqnnSQLup3cMgt9dHYhLnmsAPp7Bqe0Z7u5+oqA77nydqyN8NG98tTothoJB4z3Ctp1BFWSNOA0qqJJwSN5epLXrFDFe23DCPVb8bjNj0MqoDUGIU+ZLVMZ/QHOQzANH+M1pGfulMVrHG4l5rrRlS+GYLn0xO+/+b/XZrNAXoMvIS85a3dm079g6oA4ol9EfxDqpYm/SqIp+RhZfljMnLpe7jSoBwK4kQh3t3hlKKLNmkb/8RZwOFZ6cdPa/24Y0jonFBdfOrJGm41SnZZDaQphY2aEsOAMjYOp+nP4FNvTxS2520fZx+ZSVTPgJoWWOe2jglyVPQTPVdpqPO3Wpm4MlecVWkfBD4/1zQq5dN0tnJEd01L3OuAAuF5eHEBsO8TEkHwusNyg2AmDyNvHw65rxikX5qHAV4C80Iekxo+QOwz/5YRf8Bq5iqqF6JCavtd1J5sX3+66uOJLOXmnhZXalzaTftGCmoR/yRxGIBcJML8zRiJrJtjMcfDQ+E= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ywRVBa0tTyz/gFulVHGKTb1wIxi6QDm3RaV02FkkO1k1uPC3mz8Vx+AGyyCO/tZZvSQtu8zYkcRTG5ggp9GvddHrLNIknwsYomqFbx6NRtDbB6ZUqdzW1hue3YbIKnzN4v/OqDE/7SRdGTPqDBP0K1Kwz9rJPLcL6IT/Qr2XxbPH8YAasSMm0854uNBR1GzPcFKbCrpY0SYgc6bOSO4DYx/uLlPxd4GADNEUsBqiM6sSabwMtNBxZHT3X4iOiRJYzBvw6vg9G7vQWiNBdFps8MFIZ6k+jM7yAJFJVb18VTfd90Qmb58GHMU4ChgcUdfFGf2BE3yo1pKG5gGfH4zwo6yinWuEJti4Pa2PryVbAzmqv5h44dEUuSSTxLpCTMBxNONc7lqVS7b3QdFP9jCM+0W3HdG/iYngkaz+GgjE1/WHB0sa0mQtGlwIK5m9RfSF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: baVsX0d6BU3zETEed5zOQek5n1G+TgoUNh/oT8IsDDaH/4DVtpsbFc2PN6IwUeft7DTI+gEUxPgF063qVgzzzW+pDUA+y/tp28i4MjOx8LGsSNk8jquBNSh+a4RdTlCZs37DMCVxmBe7ayS9HiK1lA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77b5f417-5c42-4866-4106-08d98842450b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2021 20:54:05.9251 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6184 Subject: [FFmpeg-devel] [PATCH 7/8] avfilter/vf_thumbnail_cuda: Fix segfaults on uninit 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ifq4rO3uUK6p Uninit crashed if an array containing frames could not be allocated or config_props() has never been called. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_thumbnail_cuda.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/vf_thumbnail_cuda.c b/libavfilter/vf_thumbnail_cuda.c index 491542c60a..7c86203227 100644 --- a/libavfilter/vf_thumbnail_cuda.c +++ b/libavfilter/vf_thumbnail_cuda.c @@ -306,6 +306,8 @@ static av_cold void uninit(AVFilterContext *ctx) { int i; ThumbnailCudaContext *s = ctx->priv; + + if (s->hwctx) { CudaFunctions *cu = s->hwctx->internal->cuda_dl; if (s->data) { @@ -317,10 +319,13 @@ static av_cold void uninit(AVFilterContext *ctx) CHECK_CU(cu->cuModuleUnload(s->cu_module)); s->cu_module = NULL; } + } + if (s->frames) { for (i = 0; i < s->n_frames && s->frames[i].buf; i++) av_frame_free(&s->frames[i].buf); av_freep(&s->frames); + } } static int request_frame(AVFilterLink *link)