From patchwork Tue Oct 18 04:59:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 38766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1932584pzb; Mon, 17 Oct 2022 22:02:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Ga+Q1N1ODkRJCN/xbRp2ZZ2oepUhaT6rR5gIr4wCV9oP2jzeiwr5CaUmSvHG3MaYuiWe4 X-Received: by 2002:a05:6402:26d5:b0:45d:8d93:d5be with SMTP id x21-20020a05640226d500b0045d8d93d5bemr949414edd.13.1666069352823; Mon, 17 Oct 2022 22:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666069352; cv=none; d=google.com; s=arc-20160816; b=hIc+fCv0EDk6S4zniGbk41b54uZKPwwywUmxPVXE+zPci50M+YucEVHQ7UZlqUKch/ mZtF3jSuupgvaADGT9t0LZd3TD9saWTib3gwRRmpOGJFUtjiuU7DO/496v/B+VtV7ywm JsqDcZ5Ws0c+z2LinsPL6nvxWZj8mnSsI6D7jn+H1/VAHabJBioZ127o0kFTnOJ7DrwA 7IKmh3/bAHgpOlf0rdnHKQnh/Z8PaSqnasvUPNkS23X+sTBlAVc3qbOoNAbBWf/iysCr ClyvdczzcR/OhhyxPW5NsEK7U4EEce+/dqM877N3bPygw45LMJRH0UZwGO59GOLgQ/tv RaMA== 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=UEpXWkI8qR37fDEcUYAMfa88yap0YHi+53SmKAOsnzA=; b=MQiqa5iu+5OBUMjLl5AmPP35AvxgmuDRjqauVsYkiedHHjNPIKyOqk2tj1P7XoLdVK JVBZ8e178Vmt5NAl+v/pPFyvJRW5hqM/cpHiVC7uB+SdQzfhr8yTidUzQjtPCs0ZjL/9 Wi+Ti+LBEGzIvU2dGK8CUzLBqXfVskiT6NRZN4Dd4Ysmlm+0eUmnS+jrRN4vHEp0/oVx DMLLGOcbBltnobOVQNMAu/HrjILcbXK8zxJz7QAyTvz0YZm6eGxCgKWyUUhAJ6+Dc3VR UuSHjlDHsOONuJs8+x4oXXENF6a9JZsAMkvUv/I/+RibkkXyF6Z+YD8ebbVw2BSYJhhJ B7Zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=NHgVew9q; 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 e5-20020a056402104500b00458bef9c70esi9919404edu.612.2022.10.17.22.02.32; Mon, 17 Oct 2022 22:02:32 -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=@intel.com header.s=Intel header.b=NHgVew9q; 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 6207B68B15F; Tue, 18 Oct 2022 08:02:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E160668B15F for ; Tue, 18 Oct 2022 08:02:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666069347; x=1697605347; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=G3U+clLkNDvKounySusYJsr8p+FaVgAMBNDclXfjIKQ=; b=NHgVew9qMohge1o6lyJpfpYYQK7w0zm7oMtTB3J1zvO73MNIz7QxfzxK RcSlYx9SenMt2612njW0cNTa/5li51zQz54vCylDsMPg7wruF/14Lsc+k IMbCOFlkKkLBPc2/hUnY6vyUtiasC6U82VpESFihl4EuT/B5B8r38Al9t 6alg+q1GcKoooChn2Ar+Z+WhCMCR7ClVGdrI2Pjz/vXOxMmJjhgNIypiR pEPrP6acYBj3gJb/GxEFDiRXc2s+VeS17g1cqCDrl7R/6R0+vkDs+IWPL U1Hx73702U/Ng5ZvEDkkeTN89Eowcdm8+aYf6BcEnKKmo666UTLTJN4VZ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="286388460" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="286388460" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:18 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="803598091" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="803598091" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:16 -0700 From: haihao.xiang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 12:59:23 +0800 Message-Id: <20221018045925.258081-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/qsvenc: fix check to avoid segfault 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: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wW8/yJOKSXCv From: Haihao Xiang Signed-off-by: Haihao Xiang --- libavcodec/qsvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 15e6936a65..19fe6e59a2 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -2093,8 +2093,8 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, pkt.bs->ExtParam = enc_buf; } - if (q->set_encode_ctrl_cb) { - q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); + if (q->set_encode_ctrl_cb && enc_ctrl) { + q->set_encode_ctrl_cb(avctx, frame, enc_ctrl); } if ((avctx->codec_id == AV_CODEC_ID_H264 ||