From patchwork Sun Nov 27 17:33:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alessandro Di Nepi X-Patchwork-Id: 39514 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6975679pzb; Sun, 27 Nov 2022 09:34:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf5bJIIo7diET5HQwkep2cRVGkTi/d8quUX0E6u9R+WQA09s6pOKSjvM6EId6diKr3agV6sK X-Received: by 2002:a17:907:c70a:b0:7ad:d6c6:eb7c with SMTP id ty10-20020a170907c70a00b007add6c6eb7cmr32378620ejc.249.1669570453000; Sun, 27 Nov 2022 09:34:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669570452; cv=none; d=google.com; s=arc-20160816; b=iTIhXWGXXghWiU/uXSsPqWYzbncc7iNscoe4Q1/wNR1aidu92tToGmSWiK3w5i86mA ih0xcnsd1t5nzaPAyLhyOCEeTZGuribBNTzkJRGqBE5CTNl8qx74o89PvsXCiX2eEk0w OSzpN/2DBVFKT3x5D3DsBvc7zvqurD4i3j5zcJkvdTLHoVZrtfuMrbCPoH7QL1+0QsEo SumwdsWIv364/LqZJ6T5SwLfEt/Q9x8cc/1RkiNZpvsgl+iJTWGSThCrYg2Kgcg9KL1E s1a71AhSfs4PDiDsUsUyH35Cqhbd72VuUV/D5untUlNpfNLofpQZO+gPOe0m/oZ5zXJE DtBA== 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=oM07z1yPFlbmvUyBpKq7w9DM9tzQJE7gRpSfwGSFAB4=; b=ekFJbpfVX/gSR3Jqp7K26cqkoKl8h3VXCImmZYwOylDq1JSAOBay5PBRtVsn+DpAEy 6s7L/iFPFxUjgMbyWZy0S70o4CB2VkGkYkDEijpr/iRSlObw1gO4WVODVjFzHM7fsUT7 IQGb5OLM40wxnDjmOpIZt3tHYS6tL7Q5pLBS6zEECNYIqExPLO+cn1//jXSg5z+sXc+4 9x8G/Lt8Ss7WSgd101imwAUWM4QbQE2lp5H/vOXdcy1U5f06cPp9WPbpBwoZdQDCRe19 VTk9od0tPKpT0rwmAkt6RKegMDvPtuYWc5NLOHuNPnbEy81NMOOllxEdxQWKyXmQf2Gd 53Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RBRmlsiE; 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 b16-20020a056402279000b004676b7d42d7si9531642ede.243.2022.11.27.09.34.12; Sun, 27 Nov 2022 09:34:12 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RBRmlsiE; 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 48C1468BC19; Sun, 27 Nov 2022 19:34:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C384368BC07 for ; Sun, 27 Nov 2022 19:34:02 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id o30so6966049wms.2 for ; Sun, 27 Nov 2022 09:34:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FZjIob3Hrl3ZNsIZs1DyTLej0UGXL3HK1TdyLq+rPpM=; b=RBRmlsiEJyjDZhF0D+gjIMN6uErKm2Tk53URTkQTzDs+MC7OZOOGgiF4oaiULEuQs0 BGIl+SLBWtVGSBvd1Hhbi4g3ecrm8KcYGxfcBNrKeWNQh7CrJiCpJ0H6VKVHUUYmC9Tq LCP3Q61SdEPdt26i3a5DAReESJCX2FI4cVM3/ndaFP3Rjkg1UKk49Cmt/E+DarvnJXla 71d0MEHYIUg32S/3J+pWeNVyT4KBOWak3I6JN18CodOr2m7c3ZstASaylRVYeXLWb0ET WfucxN8ZIZ+d4N9hXZP1+mBUBEtS2zJLUrDj9Yp6dgagVdc6mrNqCcvKuQseJnL8CWo3 uqBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=FZjIob3Hrl3ZNsIZs1DyTLej0UGXL3HK1TdyLq+rPpM=; b=oohMtwUTyYhgTvoLCDN/ocJ3Tr3aAnZdjF/YxYNTUrsVWBuZlp4fUltae7oed58l7X E7EwiSwNzKfwEO9OlR4dAjK74xf+PosVQbyqtQmg8UIgU2LqvwtF4G5E+BZg4E6VnSex jVpoVUmP8ao/0IrToKSyqwMC0klXJeQ5z+COy34ZB1oQIuMg8DBjbg/GXY/WTYDuyeE1 IvYCDmRGmD/mQsBknsY0wWjPjHzmv7iUArQRIl9y25e+EKuDIDO4o2Rod75rcnueYT+B 3W5Rr0JufXJvxh+J41wZnK7J594meC5+23fNbIE56EMI15j+BrdHjQyV07EsLyN8oXG2 450Q== X-Gm-Message-State: ANoB5pnbo9WR1yHcHjxE+UD+NZHJkg7xEi/2r/EFPPwmDb/t16PswYHd GECj7kDhDeZXIEd/XgeNCCjjqa5tmm2gVw== X-Received: by 2002:a7b:cbc6:0:b0:3c6:b650:34dd with SMTP id n6-20020a7bcbc6000000b003c6b65034ddmr28677877wmi.45.1669570441860; Sun, 27 Nov 2022 09:34:01 -0800 (PST) Received: from localhost.localdomain ([46.121.212.87]) by smtp.googlemail.com with ESMTPSA id l1-20020a05600c4f0100b003c6f3f6675bsm17578104wmq.26.2022.11.27.09.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 09:34:01 -0800 (PST) From: Alessandro Di Nepi To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Nov 2022 19:33:44 +0200 Message-Id: <20221127173343.2577-1-alessandro.dinepi@gmail.com> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/videotoolbox: validate vt context in the decoder callback 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: Alessandro Di Nepi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7dcrd7VCW91b The commit d7f4ad88a0df3c1339e142957bf2c40cd056b8ce introduced a race condition where the passed opaque pointer reference might be NULL, when the decoding process starts. This patch checks that vtctx has a value before accessing it. This patch fixes #10079. Signed-off-by: Alessandro Di Nepi --- libavcodec/videotoolbox.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 1b1be8ddb4..615e2b087a 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -692,6 +692,11 @@ static void videotoolbox_decoder_callback(void *opaque, { VTContext *vtctx = opaque; + if (!vtctx) { + av_log(NULL, AV_LOG_WARNING, "vt decoder cb: vt context is null"); + return; + } + if (vtctx->frame) { CVPixelBufferRelease(vtctx->frame); vtctx->frame = NULL;