From patchwork Thu Feb 24 02:27:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 34503 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1419654nkx; Wed, 23 Feb 2022 18:27:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzYWjJwaHVl2KMSnNa34xez7aztZ70MA168yUIbeRAV4Y2fhVSOEJqxtANHy/z89WsAj5v2 X-Received: by 2002:a05:6402:176d:b0:410:80df:ff8e with SMTP id da13-20020a056402176d00b0041080dfff8emr371555edb.324.1645669677170; Wed, 23 Feb 2022 18:27:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645669677; cv=none; d=google.com; s=arc-20160816; b=EdfESMmcU9ZIs6Jwu3JQumnU4kCnIxhed0xaDaISF0P/40ngxeg4q0ewcbriEdNdsv mgRq6aTGL7yl1I6ca7bZslmfoKF5D8BslMJc2eodVmCr8QPwVaDs5etpnYqFaWeDvM/4 +BeHwAkfyvY1VyDM9Ug9kTWLgZljgAAve9rCWo1sLsHFjpMazHmvUvJHB/yXm8KOyFqI TscGyAxiGtx3lodYnTJ9AclG3CLMiwQFFtmC6dt89GZj8HfR+8tzSMxS4wjwv+8eQL5m dD3LNkwINmULkESn5veHY73S7Glbu4CGez/dhbzORcQ9YC/66ajPPr0l+YxLSoSxFowL X2ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=vWgV/dvVEALc6xkbcaXx29+n5oivTdrMvqlHBHG0pJ0=; b=cseNdmi2xQNLEus4DLb7BRcsA/5/vfi0srusdcmvarqwRBId+LMaRvZEyGrdnqbHau Mwrtk+8juG9cWxEX9fgn9zdcdb/31F9LMe9SLcAWPooS/a2zbQI44xVr8lKQES0ElAPg 7KO5j8QBwbaA8VhkxItlAwGZ3PjMlOXkV3qAY+rOEjiwktYGEyXTww5fseePjJn5i7b2 PmKsiFCMpho/Rou0lXBlZ6ZYzX+es71Y0m+v7xBCZLzhP6BUwvHBj4o7/LbeYnM+H6ez fZPVWA44MveBTP+pCCXlHu/QHcAK9CbP1JwIoqi+8ju+dB6zhQ4OzREORAQqqJOgBzUq ME8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=aDxskN1Y; 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 a14si698049edj.301.2022.02.23.18.27.56; Wed, 23 Feb 2022 18:27:57 -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=@intel.com header.s=Intel header.b=aDxskN1Y; 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 3A8F668B244; Thu, 24 Feb 2022 04:27:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3D2868B210 for ; Thu, 24 Feb 2022 04:27:36 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645669662; x=1677205662; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=taemaApMoHP9l0Bnvtp1ER/svefhZz7gsV04R/zN6zg=; b=aDxskN1YbDBRssF1zZ0q+x4puTJAuOjzP8YmqrEJ7BgRrUnnN2ytb+Ne LPvB0gZ6Jbl7x6x775QJmx2rgjwbvtbwqRfWeZapcbAywhMWss4mRnJI7 0HwHLys6MPlfIWRaxbuBPmovtcXXROTvdoLNCOW0sBomWdd40cYXUGJ1o y016Ylf+ok60DQm5QDqwHAgfMyi5b5uR0mHSbHv6bzoEdQW7Gr76K4IOC MKl2fqZgIRqQgKXDl/fy1kyBrNa5TrMNMBsTbkPgOPtcLuxi/cNZm7uUi RNhW6jWNwrLNP3FMj3XWImxr8jaljfBYBF9EcZUuYR31mjtoC9CxFyB/6 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10267"; a="276757132" X-IronPort-AV: E=Sophos;i="5.88,392,1635231600"; d="scan'208";a="276757132" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2022 18:27:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,392,1635231600"; d="scan'208";a="506155193" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.39]) by orsmga002.jf.intel.com with ESMTP; 23 Feb 2022 18:27:33 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Feb 2022 10:27:40 +0800 Message-Id: <20220224022740.58216-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20220224022740.58216-1-tong1.wu@intel.com> References: <20220224022740.58216-1-tong1.wu@intel.com> Subject: [FFmpeg-devel] [PATCH] qsvenc: avoid dereferencing the null pointer 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: Tong Wu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ue2c9s40B9yk The variable AVFrame *frame could be a null pointer, now add a null pointer check to avoid dereferencing the null pointer. Signed-off-by: Tong Wu --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 07be4287b7..998e43753e 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1726,7 +1726,7 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, goto free; } - if (ret == MFX_WRN_INCOMPATIBLE_VIDEO_PARAM && frame->interlaced_frame) + if (ret == MFX_WRN_INCOMPATIBLE_VIDEO_PARAM && frame && frame->interlaced_frame) print_interlace_msg(avctx, q); ret = 0;