From: Zhao Zhili <quinkblack@foxmail.com> To: ffmpeg-devel@ffmpeg.org Cc: Zhao Zhili <zhilizhao@tencent.com> Subject: [FFmpeg-devel] [PATCH v2 2/8] avfilter/dnn_backend_openvino: fix multiple memleaks Date: Sat, 2 Sep 2023 16:23:53 +0800 Message-ID: <tencent_D9704B8F661550BBA6C6E7D52A9E53225C06@qq.com> (raw) In-Reply-To: <20230902082359.260925-1-quinkblack@foxmail.com> From: Zhao Zhili <zhilizhao@tencent.com> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> --- libavfilter/dnn/dnn_backend_openvino.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 4922833b07..951f179b7c 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -68,12 +68,12 @@ typedef struct OVModel{ ie_core_t *core; ie_network_t *network; ie_executable_network_t *exe_network; + const char *all_input_names; + const char *all_output_names; #endif SafeQueue *request_queue; // holds OVRequestItem Queue *task_queue; // holds TaskItem Queue *lltask_queue; // holds LastLevelTaskItem - const char *all_input_names; - const char *all_output_names; } OVModel; // one request for one call to openvino @@ -508,7 +508,10 @@ 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); #endif + av_opt_free(&ov_model->ctx); av_freep(&ov_model); av_freep(model); } @@ -1255,6 +1258,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) { @@ -1268,6 +1272,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); } #endif -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-09-02 8:25 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20230902082359.260925-1-quinkblack@foxmail.com> 2023-09-02 8:23 ` [FFmpeg-devel] [PATCH v2 1/8] avfilter/dnn_filter_common: fix memleak Zhao Zhili 2023-09-02 8:23 ` Zhao Zhili [this message] 2023-09-02 8:23 ` [FFmpeg-devel] [PATCH v2 3/8] avfilter/dnn_backend_openvino: reduce indentation in free_model_ov Zhao Zhili 2023-09-02 8:23 ` [FFmpeg-devel] [PATCH v2 4/8] avfilter/dnn_backend_openvino: fix use uninitialized values Zhao Zhili 2023-09-02 8:23 ` [FFmpeg-devel] [PATCH v2 5/8] avfilter/dnn_backend_openvino: fix leak or ov_core_t on error path Zhao Zhili 2023-09-02 8:23 ` [FFmpeg-devel] [PATCH v2 6/8] avfilter/dnn_backend_openvino: fix leak of ov_shape_t Zhao Zhili 2023-09-02 8:23 ` [FFmpeg-devel] [PATCH v2 7/8] avfilter/dnn_backend_openvino: fix input_port/output_port leaks Zhao Zhili 2023-09-02 8:23 ` [FFmpeg-devel] [PATCH v2 8/8] avfilter/dnn_backend_openvino: fix wild pointer on error path Zhao Zhili 2023-09-08 9:59 ` Guo, Yejun
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=tencent_D9704B8F661550BBA6C6E7D52A9E53225C06@qq.com \ --to=quinkblack@foxmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=zhilizhao@tencent.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git