From patchwork Fri May 14 02:54:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 27740 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp58221iof; Thu, 13 May 2021 19:54:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6a3rTc8wsVRqjJNiX4zjvkBmzlSSnLI7a6WdtuvDvZoEV7PQr4wr6pf5Z9PRw+6Imn/IF X-Received: by 2002:a17:906:1f07:: with SMTP id w7mr26310013ejj.203.1620960871337; Thu, 13 May 2021 19:54:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620960871; cv=none; d=google.com; s=arc-20160816; b=kLnPdExswdvPH0sjQ8KG1B99CHb5NAG5VsaXSKByizE/Nw7S/ODLSuZBZ43odcOPuh 3TZSpklqpXAlFm6OdB+IZorGRcm05AvrJGd7TfBAHwqCdfqqgfLrrO3Ldgn28BQeNNq5 SVuo8SK3QmxaOTJmmLTPx/Jy+9qToTLJcGbhUifOXZ1u9sY3xYSw3q3wFznQRPbomttw cDqaNPpwNjLDIoH0uwEDBwOhwm3OB3j5BHVleEcRyKhcv7zNxMjDHPb/11utgllfk+mf IQ3nqv7Aty0On/O06L9N+dggEO6MLixdrx1mfZTpyWgHsYG3kihppn/k5j+WHjLUfAQF X6mw== 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:feedback-id:mime-version:references :in-reply-to:message-id:date:to:from:delivered-to; bh=s8NzN2KHn/RrUIReVPNUWZ+X+RPuZTK2YK7XzFwk7wc=; b=ohDzcY/7N95h++A92CAL69CcadyG39etitEHlpVIhWIzDZac38N3kj9VqWbi/5ClkP Bs5cDP5MzgS86Ibjp2kTqctRqvFi/qpcK46aNEhPyHYhryAMmC1DoDJGmZ0WEgMiH9KQ XzZKELac3ewA7EBa8dO8HlMFAPHFvFi8hGdeyYlj00r9pIrejV+MYrOhYJpa4GEG+SUo WWj3NtXDFw8sRHS74cSvrm9vsXf2etGnGFhjo55kAUuvfvm8oFRXSL4MngLzm5x2nMOC /ePYQxTJDVsA1X1PnXYj/j6SLYJglfJomeEFO3mftnjFmj5Yd9pW+z2SujGY9XXAEtcF S4Rw== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kuaishou.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p8si1108223edq.262.2021.05.13.19.54.30; Thu, 13 May 2021 19:54:31 -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; 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=NONE dis=NONE) header.from=kuaishou.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 58E306880B0; Fri, 14 May 2021 05:54:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpproxy21.qq.com (smtpbg704.qq.com [203.205.195.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 024C1680554 for ; Fri, 14 May 2021 05:54:18 +0300 (EEST) X-QQ-mid: bizesmtp39t1620960851tdependa Received: from localhost (unknown [103.107.216.233]) by esmtp6.qq.com (ESMTP) with id ; Fri, 14 May 2021 10:54:11 +0800 (CST) X-QQ-SSF: 01100000004000Z0Z000B00A0020000 X-QQ-FEAT: HCts+r7vQKZhPb+YPl4pPetLCG7BHuZNmAFJ/ev54K/8kqKNgGbJxC4RMxUPv vSTogWIVVesEJTB8MGsbJU3QaZ7x1l0MQ9pPGSLkKh8J7k5OtmGPbSGhIscbzqXgXc+sVKg DR1cOoy8ktZfG+XvOWMbbT9TMpGjVsMO2FT3eXwlG1xAR62uOhS5fNhXBgGdT6CzXAXQLuU gCkvKyt2dCeUqFYqxLUtHHsxaaIbs8uNAGQldQN25GxBsl6SvX+Te+A67GuBz7iigeWAqs+ e5Dkh0pOB2lUxo4E9pRWm2B3Wb4QlgiZaFHocYA8KOjEIX X-QQ-GoodBg: 0 X-QQ-CSender: lq@chinaffmpeg.org From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 10:54:09 +0800 Message-Id: <20210514025409.35502-1-liuqi05@kuaishou.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign7 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_guided: add null pointer check of ref_frame and main_frame 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: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7FhXvPOEvsMj fix CID: 1484785 check ref_frame and main_frame before use them Signed-off-by: Steven Liu --- libavfilter/vf_guided.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index e7c689e7be..0868b9cd4f 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -334,7 +334,7 @@ static int process_frame(FFFrameSync *fs) } av_frame_copy_props(out_frame, main_frame); - if (ctx->is_disabled || !ref_frame) { + if ((ctx->is_disabled || !ref_frame) && ref_frame && main_frame) { av_frame_copy_props(ref_frame, main_frame); }