From patchwork Fri Aug 18 17:52:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43254 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2548130pzb; Fri, 18 Aug 2023 02:53:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaOUZDC8KmiJr6jgViKLh0qUaOnb77f54ETslcrPb+rGb4jjMakcQcPHYvgyJ7k0gtZNgr X-Received: by 2002:aa7:c151:0:b0:523:372c:24fe with SMTP id r17-20020aa7c151000000b00523372c24femr1667136edp.39.1692352384221; Fri, 18 Aug 2023 02:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692352384; cv=none; d=google.com; s=arc-20160816; b=rT+h4+QyJuRjDKIl67J+eWFw7piaPbdn7qnrsVBCqn2PQbImzXpPFePId31kTAsMK3 25JRHdSmblvxMLWdBWf/30UmwmrsseVcJk3RUljDj7xGBprPzU5Gvo7T4X5Ib7YoamdG AEuaGC4ebMDDnTGJIKgnGXklGKIeQ5s/u9oQks9cidpeDg3SlOEvAWJQYqGA0VcEjEEs F6SODYAp8I4wV7W0yGlPiP66QA5kBboebkqOLFPq79tuioPKd8xYEIoLQmEhLinMY3yi z0kLwH8neC2nAVAwFSu8OqWf2B68nDsk8McuozCuYNYy+3J9ojLtnqMXsa0nFHNHcW2B VwaQ== 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=6Iyyh5ab9rJW/hb2pDmFkoU2YcpRYyofXyJ4tvw+X50=; fh=fgsEC5uuZOuzV7r9mTXgvURIGbxpRO08JRnNlycBIXw=; b=gEf50GSvgqNstjvquXb0VjxmRHMzMkmvKG1qt/kXY3t0XFfpcKRFf/UCGRYM6rDCL/ 0wPjGE1yb1+Dy62mIYLUCHsrW6FI2TEzqipFtwiFUuJt1lA1eZqr3wI1E0j1RqNQyCdv 7DWRahAPmw/g/qmJqOhCqtAE4RZUy8Z/79UnKkOZmYlz/XSv1xqaZ4NRRSx9IA0Eufnp 7JRebxo+y7dpnQ04aQxOE/S0Vdc27NdWXcmusSoIIpllOmz98v7lOFe3XgOq5RKV1ZoN 58/lSysTDMAnMkfFRDvTLZRE8zaApl7eXqL9dC0oiAF63uAwGc3MElpPmY/eG3ioR2Ta gLlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=j70RfMEj; 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 x12-20020aa7d38c000000b0052563914cc5si1133075edq.508.2023.08.18.02.53.00; Fri, 18 Aug 2023 02:53:04 -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=j70RfMEj; 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 EC1C268C68A; Fri, 18 Aug 2023 12:52:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01B5068C642 for ; Fri, 18 Aug 2023 12:52:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1692352354; bh=TUScR1kybHohHxOyHXwfpc+rRgK1Ut7NwEHHsF+SCfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j70RfMEj0kDxgsfW1j5lRe+NYmzO2TF6CrHC6BGmqC/MPPtoYJK191KPifyAsSRJZ nttXJUaKqYKVXGpDP/Y2d0bEnHkVceC7t3SA7Usb9B4EeL1c7vT16Y0hFR/0KdWgHo RQ8UzG9N/UMo/Evbp46LihwE8QfzbAC89hfVNW3I= Received: from localhost.localdomain ([113.108.77.66]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id D20AA036; Fri, 18 Aug 2023 17:52:32 +0800 X-QQ-mid: xmsmtpt1692352353t0zymjhlw Message-ID: X-QQ-XMAILINFO: MB5+LsFw85No6PB52Z1ci/cHOetl2P87eP+iwN9TL3PaPH3tO8R4Ng4+I6Dbzs owoJzQAKpJRmHztOKyOJf5ndk1JI3I0bP2b2r8N/1+QDCQq0k1b3t2CIiEGWzUfrpJn6QYiORKOw UI0Wtl85G9p25PX7kNZT72dyjjiaQZIpFEMXuDvig2O8JIojojgzCP9SSxqV73ZP4e+TVkOdHGwy ddd0FE2EDIWSOsqZhT0TSapR+fd2TBqUmrG1tMY1z1pm6a9Zg4QoswkLs/N560Kd4cb3vMh5QrdC lm9pWwnQLUCYnE3HmvwqiDwhbNtcYk1WwUEwZ4M5NDI6+BMlppE+8c4DBKSth4IJhLGgO53DvLbW /kjjOkHhFYUJShJMXEcJFrRJhq9H5YYrkUAf74CCevwjT8cvOQrWkEfbH+HdI8Nb8wuzuTyrN8RN CpzaQAGO0bvpr1LxHciSQbB5+MYCe1PKy3tRm/xW18hNBMSJMbG8jwrh7gTvS881ntM09aMzS00k 6u2RsjQjIxcYJTeUc/JrgoYrFO/rExivayaYl8TFzXwxHy16Np+Omh8YNXjNSgVj1M7OqgJJ/NXT Zk78XQKLLetO9AIHQ5+eeGlHgsiFGH9ZV2bQGvqnZm8k6HB35Mp9EpiKI9x45j/OsoZ2W+Chea3B 1RaO+wxSxgyHYYYCOXK1YQH5eqEM/cLOLpemBf5XIYYGpK1zekpAGhEd/PR5savrg/FYXdembIXn ZzkHAI45W1IK5A8evIfCaj3hjuiqmX7aCXpVmBPSC2F5I+rsRq9Y1Ft4jpb0wCpvX3MeyLfRPfhF ef8PQn4+AGKglyvc74Zi36ygoQs5UCFDI5WoXW4ZjNiSqYjvxA3y8Hz71U7Z2ohlOgmyF7Iu10QE kXzcjimAz+rR/7/S8Zvn29GrtAa+k3lvrogM3+NnQXJvIjAWOJkHh/LKZ1mwwTEVepMGuOSqDNPi tswWbqiTmr4K2OKsu4tywrfxrtzVSH+FT9lgHTkfpwwZi+pu15qV/XH7bz/8V9 X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Aug 2023 01:52:31 +0800 X-OQ-MSGID: <20230818175232.260691-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230818175232.260691-1-quinkblack@foxmail.com> References: <20230818175232.260691-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/dnn_backend_openvino: fix multiple memleaks 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: AAm/bDyCfgon From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_backend_openvino.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 46cbe8270e..071516b17d 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -326,6 +326,9 @@ static void dnn_free_model_ov(DNNModel **model) ie_network_free(&ov_model->network); if (ov_model->core) ie_core_free(&ov_model->core); + av_free(ov_model->all_output_names); + av_free(ov_model->all_input_names); + av_opt_free(&ov_model->ctx); av_freep(&ov_model); av_freep(model); } @@ -821,6 +824,7 @@ static DNNModel *dnn_load_model_ov(const char *model_filename, DNNFunctionType f goto err; } APPEND_STRING(ov_model->all_input_names, node_name) + ie_network_name_free(&node_name); } status = ie_network_get_outputs_number(ov_model->network, &node_count); if (status != OK) { @@ -834,6 +838,7 @@ static DNNModel *dnn_load_model_ov(const char *model_filename, DNNFunctionType f goto err; } APPEND_STRING(ov_model->all_output_names, node_name) + ie_network_name_free(&node_name); } model->get_input = &get_input_ov;