From patchwork Sun Nov 27 16:21:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alessandro Di Nepi X-Patchwork-Id: 39488 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6936044pzb; Sun, 27 Nov 2022 08:22:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf5fs8V6rijVa21FzvWHs69ap2mesQoT9NSjHwU0+XNzpytv4hemnJNnpcpkxMvJF9T7g7y+ X-Received: by 2002:a05:6402:3644:b0:45f:c7f2:297d with SMTP id em4-20020a056402364400b0045fc7f2297dmr44945990edb.266.1669566121403; Sun, 27 Nov 2022 08:22:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669566121; cv=none; d=google.com; s=arc-20160816; b=RYg6ehBOTuhhflvELjXNNY24rJ/7Q6p/HkiMltgOQZfqQ1PaAlpxXtoWrRYPFZf+sU 22ZMWPWtRL0TZZ4yoLzSndMuRsHZkyISitTUrgNBKHLriXTjbV4kBEQZKfRwHOREkrj0 MzMQYD9s+6g57QQadnX9T0yvBX9+1E6sQMO7NhT7TbuvbjhDgkZ+4KsB4VduLpuixhjN 8yit+/YL3iJKmanOwwQ+4cuLj8Zt39/tppxT2MU9myLWyDmqCeJSqhOsXjdis5jXrHGZ kGRNL0tZuVbrgP5c/MoDcyh5rzoNWwRfySasL0Us4uxYrW7UoIGFOdCuhAHPazUiAiQA h3RA== 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:content-disposition:mime-version:references :in-reply-to:message-id:to:from:date:dkim-signature:delivered-to; bh=8QUQQ+DIsJMc/PKEBW1zWmnLDED16gg6r66yMTM3EAg=; b=FZI0VppI1hgzonVlikxv9ufANcSQgWbty00Gq5cg/nDtktIfy0IUTp6BhJkcXMod01 hwjWAJkXQhruI3foAfme0t3NHNtljo57oNE1BiZMeVcNtKPB3Z0eGtae9ISHNRGfsiF5 9yijkWM/Tpaby6BREyeFwSuWLhzk3GZLRrLa2zRxQa37fLY3Dw5qJuVfqYIAUGDzRBhF KHhLbkDBeBqUpEA2I/UUPuCCCowg/0dpneQyKwcytUGfTy3g67tH90s0yzeBeBTsm+Y6 GaOLUbS6r8D6NoiTxWYgB6HH3kNlIehPB3ID+A6sq1AI8c6ZwuR6VncvYX5Fcsf5EzhP f+vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iZ2Mbh0I; 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 nc10-20020a1709071c0a00b0078bcc872a6esi8647052ejc.360.2022.11.27.08.22.00; Sun, 27 Nov 2022 08:22:01 -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=iZ2Mbh0I; 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 342C868B49D; Sun, 27 Nov 2022 18:21:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D0DE680B98 for ; Sun, 27 Nov 2022 18:21:50 +0200 (EET) Received: by mail-wr1-f52.google.com with SMTP id z4so13389171wrr.3 for ; Sun, 27 Nov 2022 08:21:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:subject:references:in-reply-to:message-id:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=YgLH+VWNHma0i29EJ4+wpTs2Y9jY/Uj3m6ActFFQuII=; b=iZ2Mbh0INYLM768u8xZYkSB+/CLKwbeQQfjAPbMhdcVZVuDD8o6uh8wX/gdDebeNdO yEmzHxnioelL7P0+mKCA1dq9A+3iNAztJCheJKZB0/OaiOP+O46zdhT3xEvOsdumG15b dcB/r+5FXzHDExQuCI0C1bUqdGs19fh1KHgRxr3HwtyE19W03S70+jIRt2YeWg2tk/A5 nByLk2mi9tHG5dVaYEwiFqxJSZLv7h7Yp4rwPa6yvHwWj2NTI4Y/+0VvLEqMg/xkzr7w zoHXza7++rldvTlf7gBQiG0TPcyM3J/IyMzLPgitvo0Xd+8TUfu4cKP73U3G9bNJyI5a 9aPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:subject:references:in-reply-to:message-id:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YgLH+VWNHma0i29EJ4+wpTs2Y9jY/Uj3m6ActFFQuII=; b=q9SKt4ujAFBkYyW+Y6zZTv74rl8s78fapIniCzUpx9vvxraNOE6YCrS2yUmItO9FGg hTby9TRf6rpiSLZskRrw4eB/2/m+UPHqLiCrT00rd4e82oP/sCTazPxEWSpTNhzf/eAh P2JwzICSndU0hXz6+dsxhu35fHCQYsHH8m7YsZjggRtzq0D0IiCwKWC2MqFgn1O2r5xm NMrH3HgAnFVFBIuJNR0NUIMwTQg6ouSIskxr2pBhVjubZT9cLejjpcpoX5DEFALhkrYU uuOa42nOA7qisZkFEOLckxQzou/fyxHkK3gGisFKQYrSfvXwOX4XE1JyIySLctUJtWFq yU1w== X-Gm-Message-State: ANoB5pmMX5QOx/SAJyBNes9PPiP38bAJ6OMnBXCa92ef2LeK3ODKypSn N3xKOF5ZZaAT9Yf2L4A/LLoDqSSjg+Q= X-Received: by 2002:a5d:5603:0:b0:241:c2ce:86a4 with SMTP id l3-20020a5d5603000000b00241c2ce86a4mr18253947wrv.360.1669566109193; Sun, 27 Nov 2022 08:21:49 -0800 (PST) Received: from [192.168.4.24] ([46.121.212.87]) by smtp.gmail.com with ESMTPSA id h16-20020a05600c315000b003cfb7c02542sm13008196wmo.11.2022.11.27.08.21.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Nov 2022 08:21:48 -0800 (PST) Date: Sun, 27 Nov 2022 18:21:41 +0200 From: Alessandro Di Nepi To: ffmpeg-devel@ffmpeg.org Message-ID: In-Reply-To: <53dafc80-d9f6-4b5b-a7a5-781bbb045493@Spark> References: <53dafc80-d9f6-4b5b-a7a5-781bbb045493@Spark> X-Readdle-Message-ID: cc306167-9446-405a-9dba-d665f5670908@Spark MIME-Version: 1.0 Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: w8zgA3ccSbFq 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(+) -- 2.37.1 (Apple Git-137.1) 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;