From patchwork Tue May 11 07:41:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 27715 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3744016iof; Tue, 11 May 2021 00:54:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1IehAyLsqb8ZB4p3mv1kMW6pPJvSB2Ip3hNMzUJCKQF0XCX3mD/DMI9lOBMn4TZ8IKTGK X-Received: by 2002:aa7:d90b:: with SMTP id a11mr34403396edr.273.1620719649907; Tue, 11 May 2021 00:54:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620719649; cv=none; d=google.com; s=arc-20160816; b=Dll/EEQsPM6RMk0InbM4iRnASvELKvoBpwE/wWl5/C2lWSJx5AcUMyGZPsXs2JS35q tJ6fZOEk+BaRIwlye1AtKiiRzE3+GUIvEHCEaGSe4+V4pVDO4pivqJVt7tvXB4DH38tr pXus8VX3u9421X/PS3EHECegLNdSav/6RETp7QxMrNvsM7OX73HgxyVpC0GpzxCi9Elq SYc8eCfXb6rVR99CUvP2/faBXni6R5mx77O+MGZQ5sWcxB6gaPiO2DIvY0JuFDp5aHoi Bqqxu1dNatvJw2Bdx+EqwwfdB1HFxWgVoEGtc0ksd/nx3RVgFOt3CyHHvI4/5aDyZsDQ PCIQ== 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:ironport-sdr:ironport-sdr:delivered-to; bh=4PqzfCJSqFKwEUGzig+r4jdNvFZxQvFGHZRyhClaJ8A=; b=RedonRLPUkf8w0+lEUKoRqY4WcwUmDDdomdqkEJtbLstAu/+ySNg4ALY8R2mQhniEx T9rzKoelDCxW6uwW8fT4UxxH+ftUWTpLY5Cao0MfAF0ZQTCE6vEHp6vQgB4oPICAWeiX 4Xlhg0Pq16zR/6coPcWqd3eJaUYl/4t2ixlFTDUNcZthClfQAC7oJwJyS488i1QDOC0V F6dy0RIZLKaL5k4E7bVYXCx1FdrlfBYubRz7m3ZMWQtMEvsEKakTknhLNC0M50rJil3Q haUIQdSf91shDGKso+Ew98R2geuiqdYu3/JNKTwMWAZIC12Hg1NvlfKKV/9akmdGmIdX G5WA== 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ml14si14985704ejb.661.2021.05.11.00.54.09; Tue, 11 May 2021 00:54:09 -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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4896687F2A; Tue, 11 May 2021 10:53:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43F1968054F for ; Tue, 11 May 2021 10:53:53 +0300 (EEST) IronPort-SDR: 7qtmZ8NKgPwMhjCkyweJ8J+FlzO5Y5e6Q2Qay0h2yH/+TjXfKWi+9q7bSq5K5T9BBPsdLul64m KJcRcmDXkHWQ== X-IronPort-AV: E=McAfee;i="6200,9189,9980"; a="186824688" X-IronPort-AV: E=Sophos;i="5.82,290,1613462400"; d="scan'208";a="186824688" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2021 00:53:45 -0700 IronPort-SDR: 3iobocz8u5yOaZLtYe7esNZrVzbSHuwcxhugVVzyrVQvG4byzEGZYd7dZuU0qeXlXGqOi4BUtd mE6l3n+s/0IA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,290,1613462400"; d="scan'208";a="436535629" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by orsmga008.jf.intel.com with ESMTP; 11 May 2021 00:53:44 -0700 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 May 2021 15:41:11 +0800 Message-Id: <20210511074112.18552-2-yejun.guo@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210511074112.18552-1-yejun.guo@intel.com> References: <20210511074112.18552-1-yejun.guo@intel.com> Subject: [FFmpeg-devel] [PATCH 2/3] lavfi/dnn/dnn_io_proc.c: fix Improper use of negative value (NEGATIVE_RETURNS) 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: yejun.guo@intel.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PCgCyY71Wfq+ fix coverity CID 1473511 and 1473566 --- libavfilter/dnn/dnn_io_proc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/dnn/dnn_io_proc.c b/libavfilter/dnn/dnn_io_proc.c index d5d2654162..02c8e13ed7 100644 --- a/libavfilter/dnn/dnn_io_proc.c +++ b/libavfilter/dnn/dnn_io_proc.c @@ -28,6 +28,9 @@ DNNReturnType ff_proc_from_dnn_to_frame(AVFrame *frame, DNNData *output, void *l { struct SwsContext *sws_ctx; int bytewidth = av_image_get_linesize(frame->format, frame->width, 0); + if (bytewidth < 0) { + return DNN_ERROR; + } if (output->dt != DNN_FLOAT) { avpriv_report_missing_feature(log_ctx, "data type rather than DNN_FLOAT"); return DNN_ERROR; @@ -98,6 +101,9 @@ static DNNReturnType proc_from_frame_to_dnn_frameprocessing(AVFrame *frame, DNND { struct SwsContext *sws_ctx; int bytewidth = av_image_get_linesize(frame->format, frame->width, 0); + if (bytewidth < 0) { + return DNN_ERROR; + } if (input->dt != DNN_FLOAT) { avpriv_report_missing_feature(log_ctx, "data type rather than DNN_FLOAT"); return DNN_ERROR;