From patchwork Thu Dec 14 02:49:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 45129 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp4691487pzf; Wed, 13 Dec 2023 18:49:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGVI0qPOxOmKxRTxFDxhn0RS2PGcn4hej2UO7KbFB24EO0WeEmWRKIu4h/1Z+lI9jp7dGOZ X-Received: by 2002:a17:906:c14b:b0:a1c:af1b:7562 with SMTP id dp11-20020a170906c14b00b00a1caf1b7562mr4605535ejc.62.1702522194764; Wed, 13 Dec 2023 18:49:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702522194; cv=none; d=google.com; s=arc-20160816; b=OheWr9xVRrlCjMk6/g6pXz/Vt5irXsMsatS9ooyTyYlPErnfdxwTDLqqTKoLEPF6ha ++URofDKYIExay5mki/1dH4sutUq2PG4nXt8DizD9Pie92+z3dWOJkSrxO9XtmtEGHX+ aAPAEooagurYQU9asStq/zFMjOYAJXKOA+JQ+Y6RHBC5QEuMxF33c+vvRD6/6hGSUcaE HXv6wY65ryBvsBpBQqsf/uOwN77aRXF39iVftYcWLkwvYr1D/9ABuQYvkbD6H5Cfezpd vjNtlLze70QMCeHG1SQZCA5W6yX0J4+kpRheFwW3n+J39W+3utHJKs1HQVY6Kmz7VEtB 2ZgA== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=BpXA7fcySVevn1BrRLNRx7tudVqhvSFadwJvFSQF2ro=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Zcw2k/Nfr7+8941Fqu+QLfIffR0Heb8/EiQMjRyA5U6bvcxdmSA59q6C/jayt0yVHT 0SyWmt4il4krBeE07NAIp0oeoaAalbjep2AJcWLAJRIYnKIx57UOyLmnspeMbRogkT+c OYnFW5AWFhzg4V6lDI1P4Qo5/AMNm+KHxV5dTLhTz6AcBnC+BGgHKvSJvWh9C3Wi0NhN dZAX/bbcTnEVmsYqe+w+rhaOTDaYS2IDMKx2Bcap1VEhQ4bQyCnnVUc1nOjgC0pvIrlv P2iKsAzte+j7uCmTDEg42R4vAT2NFeXBA8JLi2o93Kcxs24M+7QmyVxmPnjlVN1H/pMK ct6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kk6gl1yI; 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 gw26-20020a170906f15a00b00a1b74d22168si5976946ejb.894.2023.12.13.18.49.43; Wed, 13 Dec 2023 18:49:54 -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=kk6gl1yI; 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 0808668D010; Thu, 14 Dec 2023 04:49:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1511A68D072 for ; Thu, 14 Dec 2023 04:49:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702522178; x=1734058178; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=xiJV22B5emsdT6Uff9+lk1i55gT7kIfjhQYsE8znibo=; b=kk6gl1yIQsx0lRSGWxDvbRBbw9gXu9PLxfzXJaHv5ji0vesAaf5AVXgt e+f97qjXegbZT0SJ4ARAZsisEhb4OEi03sCimA9CxHOHHTDLrqrT25ffr dcXXqAcejQx+3bJ2pWyS1lAwvyzzh5As3OHF7pxSbGtY+vTan4iQ0AX/j NPA7GfRKjnWAm7nN+46TneD+mXZkvmVGGpfq/u/9MHDtftCk5S4O5sHNG Rr8oouqqtPOIKTDDbGoK/pGP1qkjYccy6S9d08YoMjt350MxzN+wqee0r QFJdHWTy7MqBz23EjE3rZ0aXmglUNWd3c6TuM0s3lKmJ4vvmQqpWh5Xhu w==; X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="16610001" X-IronPort-AV: E=Sophos;i="6.04,274,1695711600"; d="scan'208";a="16610001" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 18:49:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="947403470" X-IronPort-AV: E=Sophos;i="6.04,274,1695711600"; d="scan'208";a="947403470" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.156.43]) by orsmga005.jf.intel.com with ESMTP; 13 Dec 2023 18:49:28 -0800 From: wenbin.chen-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2023 10:49:25 +0800 Message-Id: <20231214024928.230112-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] libavfilter/vf_dnn_detect: Fix an incorrect expression 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: NC/iozGxxibB From: Wenbin Chen Signed-off-by: Wenbin Chen --- libavfilter/vf_dnn_detect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index 7ac3bb0b58..b82916ce6d 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -106,7 +106,7 @@ static int dnn_detect_parse_anchors(char *anchors_str, float **anchors) i++; } nb_anchor++; - anchors_buf = av_mallocz(nb_anchor * sizeof(*anchors)); + anchors_buf = av_mallocz(nb_anchor * sizeof(**anchors)); if (!anchors_buf) { return 0; } From patchwork Thu Dec 14 02:49:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 45130 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp4691490pzf; Wed, 13 Dec 2023 18:49:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IE7aZ6a2pmbx+RdQrJMbm9lTSC4c2IRICLl/cgSN0YTE0pCGeB6BqlqpDW7re2aKe5UTGLE X-Received: by 2002:a50:c35a:0:b0:552:71a8:8d96 with SMTP id q26-20020a50c35a000000b0055271a88d96mr115206edb.83.1702522195342; Wed, 13 Dec 2023 18:49:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702522195; cv=none; d=google.com; s=arc-20160816; b=RmpN63Itj4nugLEPN7Ehuu9BrGyxSHCXGvIG+Ji4uOE4J34N88CijC/mY1aiWk8qHk D/zr0QhzTTKq5Lhwd9JzoJRChSIgdNDwpwDc+U+Q1qIAakrweM19UfTowB8rdSq+tkan labqn1fDdoGXnC5VT99GPHgyZiHydQidhe4b+wAFEhiwxEzuP4LT0AQuf0JxjIa8k/rv UjgVT1OcQZAibcKnEnxQe16EbtkH5+9qD/QJn7vgfyhI3EgKphnvWPVI4gWG1fYgCX0B Vlri/upqCKxy3WtT/sgvfrTieqI4sk9Uj9wkYBzNO+jAjyV6XAEYWJ3Q5cpTfuBeWWGb Es7w== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=6rZ1tDhCoKougCpNtzH8dxwNJ/tQSzpGjC4VVv5SpBY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=xHVq0Bl3Z1QFrZtZo4VAcVY91GgVMc07WtdXPkFebu3tpVoLmEeHm3zOT53IdfrbN0 zKmCxGgLHnT4dIGA6AP1qzqPUUkj+amEp3aoLwNHonI0nkq5j2E8JM0HPWv3wxPKLno4 EaXB4ywTebvRMEczcn7wftfpLGUFf4b4mu3ivVsJYkgh0E8KXRnLdoU9OHkDeZoDcMKF 6FbLmepPw46AoHSLebASxouQ0W6xIGCKKv/4Jj94JKdRVm/8uObw2VD7ivLM+CLb2dWc VwfwqCqgVf2n3RUFN8r4kVMRHWu4dPVz/QctsDLUvLQLwuPs1wtgIXXQaPir0cHavoSq 8RAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=GOqXhYjA; 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 y17-20020a056402359100b00551e8c29f03si1413774edc.329.2023.12.13.18.49.52; Wed, 13 Dec 2023 18:49:55 -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=GOqXhYjA; 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 0540068D19C; Thu, 14 Dec 2023 04:49:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A99F68D010 for ; Thu, 14 Dec 2023 04:49:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702522180; x=1734058180; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Jvjft9lc4fIzgoKnoXc/lmemjd695CwQ6tXO/08cLkU=; b=GOqXhYjAdgLkL9HpBJVpu+k9CgD3lfUYSuMKzyzT+uhiJy729C6Bd5UV oU8URGmF+ELAVK7eiS9B5As76kve+gFxvCs456lFJiBqsB9jy/pIMo/Jp W3mg0wCfBzHEOiWJVoG1IILVQBiwU7VD3zwESioG5/drZbojY+SJtiWu5 CPevYy3A6N4hfXyLPOsHHs9bufRKwdvGF49/onFI5Ju1g975bA9MGAjiq xBflEQPgX7t0UIU+qy0XivCMlHmkhlNg8OmitYwdS2CJUYLmls1kKBMEI 1rZaG2z+MUietPoV+iRwwuyLOkGW23srfQx5gnbfA/uzX7FM8MM1LUB5e w==; X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="16610002" X-IronPort-AV: E=Sophos;i="6.04,274,1695711600"; d="scan'208";a="16610002" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 18:49:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="947403472" X-IronPort-AV: E=Sophos;i="6.04,274,1695711600"; d="scan'208";a="947403472" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.156.43]) by orsmga005.jf.intel.com with ESMTP; 13 Dec 2023 18:49:29 -0800 From: wenbin.chen-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2023 10:49:26 +0800 Message-Id: <20231214024928.230112-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214024928.230112-1-wenbin.chen@intel.com> References: <20231214024928.230112-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] libavfilter/vf_dnn_detect: Add NULL pointer check 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: JALdwn6F9YPu From: Wenbin Chen Signed-off-by: Wenbin Chen --- libavfilter/vf_dnn_detect.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index b82916ce6d..b2e9b8d4c6 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -112,6 +112,10 @@ static int dnn_detect_parse_anchors(char *anchors_str, float **anchors) } for (int i = 0; i < nb_anchor; i++) { token = av_strtok(anchors_str, "&", &saveptr); + if (!token) { + av_freep(&anchors_buf); + return 0; + } anchors_buf[i] = strtof(token, NULL); anchors_str = NULL; } From patchwork Thu Dec 14 02:49:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 45131 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp4691544pzf; Wed, 13 Dec 2023 18:50:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFg8jjt78pfog2t1vHgaH4G8hyaeRrD1p9X7+gbG0yc/8b+ePnl46uRjw4ZJ5K0c5u75eqs X-Received: by 2002:a1c:7216:0:b0:40b:4aa9:91a9 with SMTP id n22-20020a1c7216000000b0040b4aa991a9mr4539565wmc.8.1702522205305; Wed, 13 Dec 2023 18:50:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702522205; cv=none; d=google.com; s=arc-20160816; b=jfA/CCz17LHsKtuI5Q5pqnmLzrxE6drFh8U5wZ4ZdpoNoWjjlrv+rSlidGgO9ap/vZ Dmy8RVUwG5MvfRPZKX5ooVhkcX/t1qI87S+gyR7YMbrJJ5h6pumKRnSSiTTXhkKcjjyK 5AfTc3647DXLIewAcnlZ/0nwxYFgShEFwncJKBSWapFmfG5WJgGogPPVnq41E8TqzmLp PdPBZf7ST2QVggPSdPv3eo8Cu30ivfniVSy56QrFSsetXVWVLCW8H9Bz4yW5u01mTbt5 wc579LWzEnH/9XJI7sakD30NWIboURpO8bbMK798KIv4QHJWA97b19ZnO4wGykvULKxH s//Q== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=y5ZA4xvNd1vF26IVqPKdHE6Vc7j7yCz8IlhPJKXO7GI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UN5y7TwXTrZXtuM2KmHkOJk/6uWucmTw7YluEHLtS+5I6vQJxq+wgnPITa/XZJRgF/ McRBT14Z0LGW9GWwGCFeOIOaiFDPsfhk+ShOFxnvOAcYoGrl3hC43BAiPlzGLmhIrUtk 81MWwNsXzrqjNGc2bWHwDHBoxEEq13tFfN8O1ab803er38eNiesxyObomWc1QwCgwGc8 S+E6y5zZe0UfQ65yQDpMQtMltT07ENeQQMUcY0IWsBPXc+KdV4EhyHJnDM78aEmqCU2B N1akNoGLc6+Qbh6JfjdGhMFjf4L2jHe0HwxC0L3lYvf9KJlbdQuo2eWS5FFbpSgswOLz +JbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=nt1thtPM; 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 x19-20020a170906711300b00a230f3b9019si96928ejj.290.2023.12.13.18.50.01; Wed, 13 Dec 2023 18:50:05 -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=nt1thtPM; 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 203CB68D197; Thu, 14 Dec 2023 04:49:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F321468D1A4 for ; Thu, 14 Dec 2023 04:49:38 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702522184; x=1734058184; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=qCDrOSnNmDBL2atM1sCtrluHgHtjmwnrSScPe1qLKHc=; b=nt1thtPMGh1pJIQDH/0fXjhdb95mYr6AjbQ3FvQPsiC8qs+b3eL7xjlP b5mQwCclpBWrmFZP5dFNC7o5Z0R2yFKf+KxGJfJLzZ8+SvhA3zf2LmBpP M72PdHOfNP6K8KVYai0yrPNh4/skTPeTmgMUrmm4OHF8uMjtpd+j3vkje thj5DD0D6cF7JUrnivPKgvZIDSSGpHKMofhb1kbQQPDRAa1N8gJec95Lm Ww7FxpCyZ27tpffCoI0joOzManRhqpJ/BrIsKddVnXfIPdEQd7sA1QXVP 8rTr8KVHpWWKlTj23js6fh13iS9Kx2pBvzo9WchNhoiF64i+Pcx2xSYIG Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="16610004" X-IronPort-AV: E=Sophos;i="6.04,274,1695711600"; d="scan'208";a="16610004" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 18:49:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="947403474" X-IronPort-AV: E=Sophos;i="6.04,274,1695711600"; d="scan'208";a="947403474" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.156.43]) by orsmga005.jf.intel.com with ESMTP; 13 Dec 2023 18:49:30 -0800 From: wenbin.chen-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2023 10:49:27 +0800 Message-Id: <20231214024928.230112-3-wenbin.chen@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214024928.230112-1-wenbin.chen@intel.com> References: <20231214024928.230112-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] libavfilter/vf_dnn_detect: Fix uninitialized variables error 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: BjXVGqPNAtv0 From: Wenbin Chen Signed-off-by: Wenbin Chen --- libavfilter/vf_dnn_detect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index b2e9b8d4c6..5668b8b017 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -139,7 +139,8 @@ static int dnn_detect_parse_yolo_output(AVFrame *frame, DNNData *output, int out { DnnDetectContext *ctx = filter_ctx->priv; float conf_threshold = ctx->confidence; - int detection_boxes, box_size, cell_w, cell_h, scale_w, scale_h; + int detection_boxes, box_size; + int cell_w = 0, cell_h = 0, scale_w = 0, scale_h = 0; int nb_classes = ctx->nb_classes; float *output_data = output[output_index].data; float *anchors = ctx->anchors; From patchwork Thu Dec 14 02:49:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 45132 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp4691580pzf; Wed, 13 Dec 2023 18:50:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IGRqXD2VgDKqEHoOrGnZI6koh2zi7JWSJXCYgEW9b+et+/Xi38z3g83hKYTd6ZKRGncUBTF X-Received: by 2002:a17:907:3d91:b0:9fe:57b3:bc08 with SMTP id he17-20020a1709073d9100b009fe57b3bc08mr5875366ejc.41.1702522210446; Wed, 13 Dec 2023 18:50:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702522210; cv=none; d=google.com; s=arc-20160816; b=o1HOlZXxtyJl6Nh60R1sVx9LdWbine8GQL+RwfGOlVYu7q5C+lOhnwF4Dh72Ta7U3t wnegmDpydK03JPnUH5FIc4Z6d7Jj4WKf42nW+4XKAjjMo3jOGgfCya163BqSgWGB05Ja 7+AYojBrhB12AkaMiKRqDAMp7mA8AmBw1HlDWkkRw0QIeXAftLQUhy2kUrL7BlNWToBF 7Yhm4740pjDsjmQK5UxSyEotm1FLeDkMrhmXKTfwN6jxq6zqpZneodIB3Dna2/2n/n2m fkqJ2qrZkvwJRNCgFFXO6sEEYCr45X+cUilqoVpPTFslp5YDKbj4QrGMYHvmpa6WDujB 3nHw== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=fAPolaNfxNE9k5CF0UgMSbUjPQFXlnyQovAk7D1QK/Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=qHIk2dvY8HafPzXlDwjObBaDy0WgFMg/JN0uyScIot21q2DDRPXgaRQhr2UOqSoQ7G JrQWYPubR9GUwkN+0uowNr9Xz0SXBM17QBdqU6aXaHJkky3Z932SlCnM2aI9j4PvKewN D34z8ERjcQKtoeWDvcAKJ7s1E0vb/jtwu1/gp9XI+4WAPpi2nY13b1ijZX6H2uS+Y/yr Mb4sMbg71hF61h9RRrCQC1nVQQIAqpRCfVXZIG5SefjdUyyAnES4RL5QO5Rh3eSGfNM9 MC9xbjUnMjF5q0GRNFDmqrKqBsKWGj4UWEC3l5DXGb6rcLZY3GgQOh+z/vjiNwUBUo8N fQEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=P4Z47F+O; 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 e19-20020a170906249300b00a18432c6afbsi6083941ejb.555.2023.12.13.18.50.09; Wed, 13 Dec 2023 18:50:10 -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=P4Z47F+O; 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 48BD768D1FE; Thu, 14 Dec 2023 04:49:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3160168D197 for ; Thu, 14 Dec 2023 04:49:40 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702522186; x=1734058186; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=0wOP4pQO5JQlrqDmAqLXWB8y26ltEa/+pgVQIhKAQnk=; b=P4Z47F+O4C0wG1+KztfHDM2aIEK38PPab1QdoKNSjqBXritVFTNeyv2x jeeq/s1qznyThP8A7Wi7+rWShyMITe5iHgyj0ZvaPmY0b2iZDGOPRcI6r qXIsQFpN/s6dFlsmMqvghq5jBa3MIBTvqe71NtlpuPe5LZ/Wu4mw2UXMq 89Wb+w3GLv5NSyEPGEn5QB6ArzOsvCcLiu+9LMOECcERdJRl+FEzYkLO0 UevNfp8F92B0TWpZ6jTt5uteyExzrRbRgJWxSbhPyTp19jJKPOXole4pF byaYdsXGWszyXXI5b/HNNipjsRDQaAwT0kBZKYoNwho7wj52S3Mi5Io6M w==; X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="16610005" X-IronPort-AV: E=Sophos;i="6.04,274,1695711600"; d="scan'208";a="16610005" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 18:49:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="947403475" X-IronPort-AV: E=Sophos;i="6.04,274,1695711600"; d="scan'208";a="947403475" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.156.43]) by orsmga005.jf.intel.com with ESMTP; 13 Dec 2023 18:49:31 -0800 From: wenbin.chen-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2023 10:49:28 +0800 Message-Id: <20231214024928.230112-4-wenbin.chen@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214024928.230112-1-wenbin.chen@intel.com> References: <20231214024928.230112-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] libavfilter/vf_dnn_detect: Set used pointer to NULL 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: U3RFPoD51oYX From: Wenbin Chen Set used pointer to NULL in case it leaks the storage. Signed-off-by: Wenbin Chen --- libavfilter/vf_dnn_detect.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index 5668b8b017..3464af86c8 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -223,6 +223,7 @@ static int dnn_detect_parse_yolo_output(AVFrame *frame, DNNData *output, int out av_freep(&bbox); return AVERROR(ENOMEM); } + bbox = NULL; } } return 0;