From patchwork Sat Sep 2 08:23:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp55829pzb; Sat, 2 Sep 2023 01:26:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE7YabOPS7RivICOc6mHfplIVyz8jSyP3hCa18RsX6UHwEB2rje3SVeFrENUrdWGog6Xb5A X-Received: by 2002:aa7:c155:0:b0:523:b225:701a with SMTP id r21-20020aa7c155000000b00523b225701amr3558514edp.11.1693643188692; Sat, 02 Sep 2023 01:26:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693643188; cv=none; d=google.com; s=arc-20160816; b=A+CmwImIVmN0rEVFHJewtfgxd5vWYRAWQahbXUJ0wjXZDPAwNMKvp/HlP8kquLpCSS XtGTTaLG0kXlq04yL4bRFRJnMvJNf8Pz/4ByBDkka0pvrDotGFdtOh6LIKyV3Iozio4B MFKXsNU9zMMIQlWhZIArzI3o8ZZxdvamf69oxmCewWxxPsmJkZN3QjmqXhE4iUaPf5i3 t2BHzEG5ZgkCeiRpXew/XWHd2T++f2XU1izeCvkWkJvEigvQhf+tc4jicM4HwHe2n10e ucyW/ekaMo6xyrma6NzVDcPh7cgLNsXPQdpXodJgI9lcRRUD+yS4d8FsBsKNFWuRNP9X nEOg== 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:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=W4Fr04WjM+A4j1Xngaf94y2CFaOxsCKhkGqymV9ISvg=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=Ij1RSW9ipCS9mwlAXFk4mw9M9xTmvs8hvgw4dtQRxQMHhYyIn0RKKICwbBVQt+FNE1 uzB85GIDb+jnDJrlSKiREl88nQNGvP/U4jGzWR31HiKHo6/pmDZLD5E5jClNGD6MXVMq 0QMuFja3gvr/mN9eLz5sMQ7bqq4FA/HEtfCS/Kt/HDU/2HBvk7kNdDpxmk21FDJ2sdfX Pk2ATawHWU/s5XTCsO10T/C1wG7c0A+GrIg9cihgUN/LVx1Y5cw9QZRozGh5w8ZzsYD9 dxsJZqWfdLBDa53KGUPLZ9g8eWQOEznyvonk6NZknvtCsg256EhPHIgNQ7KtjJjRwb3V FbWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=bm+Nz4ai; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k1-20020a05640212c100b0052a401d8ef4si3717152edx.434.2023.09.02.01.26.28; Sat, 02 Sep 2023 01:26:28 -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=@foxmail.com header.s=s201512 header.b=bm+Nz4ai; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF27268C7DD; Sat, 2 Sep 2023 11:25:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-190.mail.qq.com (out203-205-221-190.mail.qq.com [203.205.221.190]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DCC268C79E for ; Sat, 2 Sep 2023 11:25:13 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1693643105; bh=MxVuWsnQ7AB2eKyYO5LUBiGfPV2TfpnkP/zi3QCgyEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bm+Nz4ai5ZPMpU6MpR0iyMNXeyq4hcozB5uB35tbIs8Lu4VBkP7opdFjMI5l6oEhu Q2GtThLmv3xw1ufc13jzutD1fXSzKeuhHVxjMfqXuOuadlKroJUdxpE3oowGWX8hRM XwcY4inqgzTExPYWQcp9aXzz2im7I8zestAYjGEA= Received: from localhost.localdomain ([113.116.30.246]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 640954A0; Sat, 02 Sep 2023 16:25:00 +0800 X-QQ-mid: xmsmtpt1693643104tp4qr9f2g Message-ID: X-QQ-XMAILINFO: MiKCDQn4b3+YXVHfpUSDopZ/5k1owIjmYyxY42IeuRHG4dSvErBDXl8minjdXr pczIRsOJ+LY0i5LeDaAYOzSKSTIFDki45jsyLJuZ6vn/dmAfsXIEv4gzgq95FCs8gYyM9t/gU/uU 0zsboMgoZwsHwpvmqfeNMznqVsAVntLHd74BRpR83iceILKdh2ZnL+PeXyAZYflaGmRzBXWnMIAQ b17NDR9NaCwTDhwdzHbc39tW1Gj+3wlhkTYBf2F+Sql9lq0J39mxQ2u5V2Cji2D2M7OHAf5Aohc8 mw52Gv14/N3Ir8R9GyIVXhPixz//yZNAGDsVI1ksfPrvTB6aNlvd0Z5OqOS6mxYe/RB3UWKY+g9B QyirqkwWvVujtHc35jUZg9m546PaQGWjNUI9jB5v9u2EW35iBvTNrqCBoXnMNGDC2tGDM5dl3T8d Mwo3Nesln9gjhZu3IYTEoakXnZGygx+D1SW6Zq6geLF9Rf/lSGYhqa+KprEOrt87HVcdNj4JbGDo /f2X5XsVlJbHoNkKIh3eV57FvJX3f/onhEu7uhFMQw/c5HWYzga1Hi5QKgKvzROHVW4aJ6T6D2pe OTmEv+YSC1kGZKbLcq2RCQS4BdaJSGw6KoVT48dH8r24kJR0bqdGBubkPBzChnL2l7JZlBUp4AGk fcmKZA/a1IlQRZLY/360TX66L36dCkheQdHipfzwXIzQU3wSumNB42wrhlZJLTncMHGjEmnRq8af UoP+wdMh/sbxunbS0QTUotWnza7bX3ta32PFSa6rSHYLXXTBF2mw2ZIeKAq5+jQYUyYsxn4EoEin 5ICFLGV/JwPpdJrJI/FJjoGhKzG29Yc6r8WLiLRAKiOmOFKTv1PBDPh0sieraI7JCKhNnqkWkXrn 2mhPOCIO/dJcQKCt10KG5RU38gNl6x9JMJMleM+JO1suTyK+Xj+r9n0vnKPPhfH4vP7a148WMStx MXP0KJKuB4LGvShoHa2pHQ9JF2a1f9AaHBGxJDD0oH5a0YQR8QE33x5D7jb5Fnt0oQpmLaOTb9n6 qeO9/jpA== X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 16:23:57 +0800 X-OQ-MSGID: <20230902082359.260925-7-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902082359.260925-1-quinkblack@foxmail.com> References: <20230902082359.260925-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 6/8] avfilter/dnn_backend_openvino: fix leak of ov_shape_t 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zSmWf2EGLSYI From: Zhao Zhili --- libavfilter/dnn/dnn_backend_openvino.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index b3910adfc3..f9944211da 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -225,6 +225,7 @@ static int fill_model_input_ov(OVModel *ov_model, OVRequestItem *request) status = ov_port_get_element_type(ov_model->input_port, &precision); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to get input port data type.\n"); + ov_shape_free(&input_shape); return ov2_map_error(status, NULL); } } else { @@ -236,8 +237,10 @@ static int fill_model_input_ov(OVModel *ov_model, OVRequestItem *request) input.channels = dims[1]; input.dt = precision_to_datatype(precision); input.data = av_malloc(input.height * input.width * input.channels * get_datatype_size(input.dt)); - if (!input.data) + if (!input.data) { + ov_shape_free(&input_shape); return AVERROR(ENOMEM); + } input_data_ptr = input.data; #else status = ie_infer_request_get_blob(request->infer_request, task->input_name, &input_blob); @@ -300,6 +303,7 @@ static int fill_model_input_ov(OVModel *ov_model, OVRequestItem *request) } #if HAVE_OPENVINO2 status = ov_tensor_create_from_host_ptr(precision, input_shape, input.data, &tensor); + ov_shape_free(&input_shape); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to create tensor from host prt.\n"); return ov2_map_error(status, NULL); @@ -362,12 +366,14 @@ static void infer_completion_callback(void *args) status = ov_port_get_element_type(ov_model->output_port, &precision); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to get output port data type.\n"); + ov_shape_free(&output_shape); return; } output.channels = dims[1]; output.height = dims[2]; output.width = dims[3]; av_assert0(request->lltask_count <= dims[0]); + ov_shape_free(&output_shape); #else IEStatusCode status; dimensions_t dims;