From patchwork Sat Mar 13 06:28:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 26374 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0EAEE44B263 for ; Sat, 13 Mar 2021 08:40:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E303D68ABF9; Sat, 13 Mar 2021 08:40:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A56A468A995 for ; Sat, 13 Mar 2021 08:39:56 +0200 (EET) IronPort-SDR: bLW6Je2f5WrQp1KRk8K2kJ939OuyR6gjoPs1F9lZoPsI21Kkp+Ol8VLIH5mdkmvuohJzCD9DKW 4EdjVuKuW9Hg== X-IronPort-AV: E=McAfee;i="6000,8403,9921"; a="168195469" X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="168195469" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2021 22:39:53 -0800 IronPort-SDR: hsuvpJoFDlOUyVcQtet27y96h/keCPS39UEiC2piW9fWh3uDVf4UtmhTUxfUYJdiwvRppa/WOB t8Vxlsjc1kKA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="604197278" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by fmsmga005.fm.intel.com with ESMTP; 12 Mar 2021 22:39:52 -0800 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Mar 2021 14:28:52 +0800 Message-Id: <20210313062855.27212-2-yejun.guo@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210313062855.27212-1-yejun.guo@intel.com> References: <20210313062855.27212-1-yejun.guo@intel.com> Subject: [FFmpeg-devel] [PATCH 2/5] lavfi/dnn_backend_openvino.c: fix mem leak for input_blob and output_blob upon error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" --- libavfilter/dnn/dnn_backend_openvino.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index d86fb124d5..df1631e86e 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -141,12 +141,14 @@ static DNNReturnType fill_model_input_ov(OVModel *ov_model, RequestItem *request status |= ie_blob_get_dims(input_blob, &dims); status |= ie_blob_get_precision(input_blob, &precision); if (status != OK) { + ie_blob_free(&input_blob); av_log(ctx, AV_LOG_ERROR, "Failed to get input blob dims/precision\n"); return DNN_ERROR; } status = ie_blob_get_buffer(input_blob, &blob_buffer); if (status != OK) { + ie_blob_free(&input_blob); av_log(ctx, AV_LOG_ERROR, "Failed to get input blob buffer\n"); return DNN_ERROR; } @@ -211,6 +213,7 @@ static void infer_completion_callback(void *args) status = ie_blob_get_buffer(output_blob, &blob_buffer); if (status != OK) { + ie_blob_free(&output_blob); av_log(ctx, AV_LOG_ERROR, "Failed to access output memory\n"); return; } @@ -218,6 +221,7 @@ static void infer_completion_callback(void *args) status |= ie_blob_get_dims(output_blob, &dims); status |= ie_blob_get_precision(output_blob, &precision); if (status != OK) { + ie_blob_free(&output_blob); av_log(ctx, AV_LOG_ERROR, "Failed to get dims or precision of output\n"); return; }