From patchwork Sat Sep 2 08:23:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43455 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp55572pzb; Sat, 2 Sep 2023 01:25:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIvgc6ZHB1lEsrp2EObujkFBfxf7v60Agt4H4OsKvxBOooBXTHbWDT1pHyYatMb4cfsDjA X-Received: by 2002:a05:6402:1ac7:b0:522:1d1d:1de8 with SMTP id ba7-20020a0564021ac700b005221d1d1de8mr2859617edb.2.1693643137486; Sat, 02 Sep 2023 01:25:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693643137; cv=none; d=google.com; s=arc-20160816; b=xVmH6TLhrjynD5bs8C6w8tWhDxgfNnVmb4pF2cLos7+omcvYA3Vkh8vU3jxSkk/xoz TSWNg1idzLYNdHT4ERFmaRed4LWLMy3woD9DMOFC42u9jusX1vDxDyypuXpWKtXcKqOX icwhX1lV2H+KDw3ERjvGGnvpQ7savmqOn/zc809giJdDspHLeQxIzedyvgJ/clkDdB+o xDgSqA2htFrHbOPz+u54XuKRLGpUbuKXPfr+uL+VRW1Q5vk3biwkZAYHv+MB08PO2wPk qch1g3BSOCDts9xEG4OuWyOGA7+p0YXgUvigL47BGmI+FOxxHh4QqY0dLCpxB2XvknkX FDuw== 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=oMPWCCfKIfT7QBTjQX+6Oeq19AS3EP07cT+JqEhfDu4=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=a0nS5cUSGMlCUJ6K9gdWoN5t4N1AgL+Kg4icYSKIibnYRT49TyAUgOPTnv+ulJa/er c8BMEu99wxPFyKdDpu9uCLLqUY7RhUc9sYt5LEC+w4ntJ5u2MWSJ/z/7LbA1viAbH2M5 EzFDHoCTwV7o8H1+AcScIJJyGNlXupAKVcefJSEpH16jRi6vQaOENmMhuj7SHUOdcvRe G1Lx3m4yWeoi2zQJMecFxQk+o8Hh3HDj5AxqZ3ICCtRFvfeaGc/nCLlqGSmz6ewvV2Jn +CDr/9V8lqVVh+FTcEyKYOwWRiXhDdtE5rDCvNDo3ch1oaIS6W9WL4l1uNV1fIocQXsn ZTPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=JxTviqMc; 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 x26-20020aa7d39a000000b005257d5ef3cfsi3647279edq.51.2023.09.02.01.25.37; Sat, 02 Sep 2023 01:25:37 -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=JxTviqMc; 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 8C43F68C7AB; Sat, 2 Sep 2023 11:25:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5919D68C63A for ; Sat, 2 Sep 2023 11:25:10 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1693643102; bh=cfOZJTWN2AVlG/7rYvyVyG9u5yafGhMR3bnSLhCLSAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JxTviqMc4l1sn6yXoi1E9vAM//8R/0AXcL+k3LUVMvEusgS+5get0xrb8nvuJRgQK 8zwzqx5e8AsJFQVpMp+b9fcWdI3aXE4PECzHd91IpslzALgELcO4NJXTz8zNZhEdKW gr4usdl5uBgNwiqCUs2Jn9aj9PgmFTYy8wRvYfLc= 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: xmsmtpt1693643101tjck9jc15 Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeiefIVaRaUPvAoOeY9gc7foHXDxyMR3MqunjxGmK0tzr/3rmkJirz nIXQpDJ53RtURI8jhkyc9VoFlZLVLt9Usm/fU0imUkgzQOkaoQzX6MJk2mVbGPF2G8GzWn3YkXuo zEODFXugF6Y87TUlgRKkXyDK0evRnjps8rAjAV6Iq0FeNv8bAn9p4k+p4flEflwjZKpNsfQQ4uda KEx/z4dTSryBriixDhSGoaZf7zbXIHH3EBvyp1KGExTL+9Ffdp+VZVbfU2eabDKHOpkII4Mxe/JQ TeLkGYrsNf5Z5mgRdUeYJ6JZbWybC1eE3ifa8E4oqPhZo7ozyuxrxYwTn3WSO+zu7uoLACiZZrW5 PVOHBBmp3D6xv3ICg4I/H5eT5hEDaqJ0knd7J5FKhaG+obBQHsN8VQkY0hf4Fw5/17IJQ9tU4TVT cU5ltTn9ygOKkxzftQTf7+QWaLzca9lUGd+lQiPXjAtjbGn33fhGUMN0why11cyMA82YH0yfnXoD dnFOaJuHhJNOi0P1NdtDuDSnuXVqNjm9Hyfar7UZXvYh7527UQAPyra2Y5be0MXfkQznKPN22oPU ewxRmM9BxANdO78Q6z1Rp2SZtziIb354fIBlWiu6DpW526MARK6dPHDghIH6V6rP/LKMzIp3LNSh nUM91LCZwDawbxUTOHWwjFKbZDu2O23UE4XWsrnv30rh1NjzT0PpauyxLhOtTgo0wcU/upBd/1iT pM5CCXGC7jPiCUS4P4F4UMwn/tmSuSiEB4PvPiTgq1CX4HQsB40nULoNUPAP1kna9fOaLY3W4Ehd PIb6zDXm2hiL5uECOlRIuwHlPpBo5Y4d4k9vpv16paEyZpV2O6pNRzeZiBOuUH2KrnQWkIB+JM7J w0ComAaKQUW6p1L0T3xm36Yp5ezeH6ETbPXPOATA0PlkNeFkkLpPWt20LroLhDZUJ/hZHs7bs6Ec auPwiDdX2FmSfoAeMchkmiOTVJVAKsot8jvNSRuKXxljm1+5Q6KQ== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 16:23:52 +0800 X-OQ-MSGID: <20230902082359.260925-2-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 1/8] avfilter/dnn_filter_common: fix memleak 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: +kHLkS6EcWCF From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/dnn_filter_common.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/dnn_filter_common.c b/libavfilter/dnn_filter_common.c index d175c91914..3b9182c1d1 100644 --- a/libavfilter/dnn_filter_common.c +++ b/libavfilter/dnn_filter_common.c @@ -159,4 +159,10 @@ void ff_dnn_uninit(DnnContext *ctx) if (ctx->dnn_module) { (ctx->dnn_module->free_model)(&ctx->model); } + if (ctx->model_outputnames) { + for (int i = 0; i < ctx->nb_outputs; i++) + av_free(ctx->model_outputnames[i]); + + av_freep(&ctx->model_outputnames); + } } From patchwork Sat Sep 2 08:23:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43457 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp55625pzb; Sat, 2 Sep 2023 01:25:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFi80bd+6QXK/Jj9Zh0A6C9vcLtR5G2EGe11Axra05+wmaYa4iRtRERiedNR2IHoPKeZOFB X-Received: by 2002:a05:6402:120f:b0:525:ce69:b52d with SMTP id c15-20020a056402120f00b00525ce69b52dmr3548978edw.39.1693643147259; Sat, 02 Sep 2023 01:25:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693643147; cv=none; d=google.com; s=arc-20160816; b=qgLb2ECYRFac0fIQvY21bkvj+6rBgKNtgtWdZZFv/ak7F4H1hvzRyyatNcBvdFPhyD UOJ15zgLWAq9N4dETo/b0ryGU43eaUiPssZQ6DteOPFnXDFlIzZNFIZW+ctu2a5PDNyh DR1K3eRGMnHHnxu0rOOzYpE9QJo02H+rtz5z3nzDBbmw75n2jsQOadHY7VkhEelhAflP VyDxXLgJpbWogZIvUClXOto/nqbAm96RezFyiXm1POttbbzZzReoB3kxyLB01F+kY4er F8Bjjny/eMGA1jYvcNoHGgIcYmf0gup5HwZqy07kPTX+Bhta1Vie+tzihf6Bgxqs3+Jc R2aw== 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=Y/W0yLI7l367wswfg7YewZV0CrLml83OiMSS0FB83AI=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=w0j4Erw1HJPxSwoWqePTwdYdEu91nFiSthNLbhBVhAC8DGx+SVkjOYjDvcCMLMiiLC zoXhZDfb3fsdmdKQEFDmA9Ai9ZtWteq6IuxyyovDup8L3vo47jjuEFFo4jU5nCbtYJDA qWcWhQaWVBvV/LGri3yrPBJWKIvbATfqP4kQXy/0ovP/W9Lr0ks4tfEbrpGPyWqDmkH9 krAcHT0EwToZoZKbPa3NCgOukeoYDsq8xHHr/330xZ6xLfRNkI5Ym81Wp7iLWqc1KPcm 4fdjTJ0qzpFrTVW5HgfmLTg2NA/Y1FaQvd6x45zwcqM+NFbKMb9E3Gdj+9lQ8NHPD8lX S8Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=aD9NN5JM; 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 a15-20020aa7d90f000000b0052542edc0afsi3531883edr.256.2023.09.02.01.25.46; Sat, 02 Sep 2023 01:25:47 -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=aD9NN5JM; 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 9223568C7BB; Sat, 2 Sep 2023 11:25:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-236.mail.qq.com (out203-205-221-236.mail.qq.com [203.205.221.236]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D3A568C71A for ; Sat, 2 Sep 2023 11:25:10 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1693643103; bh=AMPIzoTBJ1LQhkwUzeeQ9DQSoq+qSt84WdGKzCEOQds=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aD9NN5JMeI2uAok7RVwiEIYnsvUSp6JmBYfnVLNHUgqYz7shS/ujA9Z76iO2evtzD VhCm5qth9qQ1KcrmcL6c6irL6wM4aWqwbXJeu090G+IvIQzPWvR8hYrSKRIEB4sKun fSgadeLRD2PEMGFPI1x8eFf33VGkNrTgiV6M4eW4= 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: xmsmtpt1693643102tgg7s7s4q Message-ID: X-QQ-XMAILINFO: NvH2zBBgt3uT25Lk7HfawVZDdvK3jnAm1YNl2rWnBmLwhp3L2U7uN9QFRqARFU xiLrTc9WCS975KNGiM7OgfCbAcmXXPZLI9Smyrj7wFob4ccKHEBpZSI+QOygThyqr38zpZJUpEHI YK1WbtjTf9PhYS+k7r7QQ5bz8BnyI9e46MVlztZYOfatK5BcxN3s+j4ZQNsV9RgQkwu5AejQQh7P 2PL50z4NalJr8so2pEJMyBCog/tZxBD8fZRS+i3/Mz/zdww/QDChJfAv0AhxCxq06mRIdGLlHt9h FeN7yXV7+lpdzHy08SilOiFcnzbb5HDas/ktv9bpaiSJ/RKwzWRgnvMXBtGNUCp+QT3uXCNfKKug jFMACs0+7stH+Gr42szF4orqcmHkz4yNcyIOqWrORybFYDypsDJEGdOqCsXbHzaGYBoApsOXbj9b 1+5rmy5uv5m2TgkW+2FzCuWxy76pazNI1HIryd5WBGE6baZD+FQxsxMXQG91LvtmGMPzf1E44uOf sTwRKsfNluhCFbTfWRyqGhEjyTl/eXXT7+kTWmYrDVkCmuUDDmMYyCdyrNqfruuOs7W4KrSlFy6i cqtsiBa2fLzAjZD1i3o0GhBhYVK+Nvvvmf0ZqN0tMb5PK0u9qoyp/vsbl08/lziH5QMkLFwCRgAO tg4iRlD95cI+PC3dg2X9bYV2nbN+W/6gxR5r+xzEwNRu0ayRFBffZvPKP4VGGLwqy1w0viVD9K5U SQKNAx/27HYus/SatmZrc3iRf7NfReE6+AYwIIJxnvczoHmG94u/oQkLzAVE3QG3uGNVxZUnpZ7g OiPJ/IiFzccZdQGIFKbPa5PQR2poj/WZeSuKm3bPcJrLOkHUZsWRsMYFSPMTXx69pO61a9yJjS7r I30Ep3HH2p2c6CnGGLAoXvWb9SNjXRqnBjjlbKtu74UF4GK1iy22c3+2lnAX410IdmEzn2qabmjt WQYP0To6p2iQJ+ozvlmtGsb0cG8fXUco/aDV6a83GpFGIzUngjsA== X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 16:23:53 +0800 X-OQ-MSGID: <20230902082359.260925-3-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 2/8] 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: ZmwMYvpCm6ab From: Zhao Zhili Signed-off-by: Zhao Zhili --- 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 From patchwork Sat Sep 2 08:23:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp55687pzb; Sat, 2 Sep 2023 01:25:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQE3vRO55CG2E26TCyZMMu7ZLOmLaVPpLCTBGyOmyvtsOabnz7XgOPgPUgwHBQSVYaqo/7 X-Received: by 2002:aa7:c389:0:b0:523:38eb:395f with SMTP id k9-20020aa7c389000000b0052338eb395fmr3654761edq.2.1693643158266; Sat, 02 Sep 2023 01:25:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693643158; cv=none; d=google.com; s=arc-20160816; b=JHmaRWbr8i/qNMMcP32eBLUZC2Je7dA3Wn+ogDGQaor8Tr3vq5LD+oUmRY71Kf3VDz SdiuCn459ro1Yn0HeaTBO7oAfz0ceV+AJZmPVzlzErLXvnE0OPXPrKiQ7rq/JKnZ1RPs r0wB6blMBJp9CcRWkrmXktPcAQaMoaIONkxKtz/Q3w8Oke7rj9gOc3lfrph6sy12603z FoJm0kfEGQxqcPO5texVp0/2t2b0CT4UKdF+5y+qUJeMLXbFg0TZUlQPIWhqTqFf2qvt FAL5Zy21kpBGRleHWK60BfZPDQxpj/cyUsoar5jh/R6FJLOsJ+L/IOQXbfLruopmTUnE OS7g== 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=LOLtBDsXfEzdRRWVXsg8vBlWUNhbCqbhGR1iTXb6syY=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=Gq6L+i7A/CK+6IPDpjsW1nVgT9Grh38VZoVHYTHDxne+QAMrXP0D2Y+QkVKV1zt8fo UNJ8zSuZzW75PR4ghp/ctzrdKYsYxZZD7KDpZ68QFkmIr6GKBwztahu6WqzScoyWP/08 CoCX1bl4xM8JnREOb02r+ureShfE+ugmMeN0/nVDTq0pW1Gn6lf0y0Xv8HwalQlIvQHo esv9DlWYiU4KMGpFWPAnfXOjNcASOfRMqa+lRNCc0ao7QHjTogFrCG6JmHIDuFvRdSYE fbMXtXEC0r1ENK0UZaj28YJwToFrQXRnw5IlekCFybYThzYWPL5SPCjQeJEcMt+n79DB Sgsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=FCl0tB3c; 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 r12-20020aa7cfcc000000b0052a11cb4b23si3549964edy.688.2023.09.02.01.25.57; Sat, 02 Sep 2023 01:25:58 -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=FCl0tB3c; 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 AADF468C7BC; Sat, 2 Sep 2023 11:25:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65BD268C736 for ; Sat, 2 Sep 2023 11:25:11 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1693643103; bh=3azGQ8cDINqIV90Rwyfshxa7m+lx3GTesGkBj6rk9rU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FCl0tB3ct9XRj5hu3K0lZo8WyBT9CFG0ZXm8nl8sRU7Ot3PNBc7oSkV/O1teCBR1L YyhcXgmyKQijGsCBzA+3j2hKthzxnO3McYUTxfebHMjbwbCdnQX4rkvHvLF7fEUF2v IBb7dYRjvbOWrb/raWjVvedDnWjxdnmd8yDnOQbE= 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: xmsmtpt1693643102t437csp4y Message-ID: X-QQ-XMAILINFO: NB2Y38G+/V2YwckhGIh7C/rZYNmzjww3wx5rRrG9CO8QDJUo8NwhmpJI3fHvQX z+FaH6kM+rUaADgd4H4A/yiaHFGjRTJGyfXv0sYIV6IuBCtA+YK3hJRxE0wkipdz4BkTy8/hFMjO 8q+9JX3gyS6otq9ZylZyl6q/+ctFgUGuPcLrWa/UrSb0tlXQNJGKoYJBWnK9YdHsABrUHHO0y3MX b81Lp/2k+5J5YNhGMXlo+iNaO9mspp42ia6nlYmEfaRyFlxVIeumy+b7OvJYDuS09Ph75K9qzJZB FlB0enKGms3E3v3uXnzs8PMIPVNq4k6oBaQQo/aIESEjwT8Fty7DhYzfAAcI5qnZUu0caJ8heZvy XNugnSpy5ntgOU9ge3gIlqJfih7KDVOJXdYRTlxGFrITUrwcNGp9ylWXGg4O8LidYPecH+eZDD0c gOj7x3bdqIlFWLrAlw7JMkbJjISAXQEaxvShvjdZzF6ft+Fg1fX0kzH47O7P49sqmHlcpwkqi2RH eTv2OwdGS8rZFFEVOkp3hkMk7/VGODhGF5a4k4VBKyl2KFKTSkmoEhhVCr1eNgQEo2fT4QSCXWgB a74zqc+qRicE7Dz34XTTU9sCKnYbHk9YeBDyPMlA9DywAUVnPZzB9heKaFwY2jZilfT6QwsTgLGH ao54IiQHtgUypXKPiVTHM/56edFSpwAOZ7i7n1RRee1urycj5ZhpENHdS5ONAwezBGU+d4hPIHy+ NtkG2qA53zM5x2+MSz+nLcb8Sxi3rQPXP4/i+t1Vee68AoNdqJeMinCk/SkB/kQZvLhIqgCbZ0hI G5GJW+AnS4a5KCc/sygpCIDNhsjeAH9MyjQZDaey9l+eAW5x0JWFoAxYiAS4U1heb8TBOjX69gcC 7wO8ufUWyqeaREfn3kifzhc0RfLLw3GLNCE6n8Ppw8w1aFtvTCgX2sAyqO5CrFiGBNq2DoCPR73+ WvjwWZ6U+UgNu2VfY3zclRR1xY157H X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 16:23:54 +0800 X-OQ-MSGID: <20230902082359.260925-4-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 3/8] avfilter/dnn_backend_openvino: reduce indentation in free_model_ov 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: HILxGEPSWZ4o From: Zhao Zhili No functional changes except ensures model isn't null. Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_backend_openvino.c | 89 +++++++++++++------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 951f179b7c..85db4ecd35 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -463,58 +463,61 @@ static void infer_completion_callback(void *args) static void dnn_free_model_ov(DNNModel **model) { - if (*model){ - OVModel *ov_model = (*model)->model; - while (ff_safe_queue_size(ov_model->request_queue) != 0) { - OVRequestItem *item = ff_safe_queue_pop_front(ov_model->request_queue); - if (item && item->infer_request) { + OVModel *ov_model; + + if (!model || !*model) + return; + + ov_model = (*model)->model; + while (ff_safe_queue_size(ov_model->request_queue) != 0) { + OVRequestItem *item = ff_safe_queue_pop_front(ov_model->request_queue); + if (item && item->infer_request) { #if HAVE_OPENVINO2 - ov_infer_request_free(item->infer_request); + ov_infer_request_free(item->infer_request); #else - ie_infer_request_free(&item->infer_request); + ie_infer_request_free(&item->infer_request); #endif - } - av_freep(&item->lltasks); - av_freep(&item); } - ff_safe_queue_destroy(ov_model->request_queue); + av_freep(&item->lltasks); + av_freep(&item); + } + ff_safe_queue_destroy(ov_model->request_queue); - while (ff_queue_size(ov_model->lltask_queue) != 0) { - LastLevelTaskItem *item = ff_queue_pop_front(ov_model->lltask_queue); - av_freep(&item); - } - ff_queue_destroy(ov_model->lltask_queue); + while (ff_queue_size(ov_model->lltask_queue) != 0) { + LastLevelTaskItem *item = ff_queue_pop_front(ov_model->lltask_queue); + av_freep(&item); + } + ff_queue_destroy(ov_model->lltask_queue); - while (ff_queue_size(ov_model->task_queue) != 0) { - TaskItem *item = ff_queue_pop_front(ov_model->task_queue); - av_frame_free(&item->in_frame); - av_frame_free(&item->out_frame); - av_freep(&item); - } - ff_queue_destroy(ov_model->task_queue); + while (ff_queue_size(ov_model->task_queue) != 0) { + TaskItem *item = ff_queue_pop_front(ov_model->task_queue); + av_frame_free(&item->in_frame); + av_frame_free(&item->out_frame); + av_freep(&item); + } + ff_queue_destroy(ov_model->task_queue); #if HAVE_OPENVINO2 - if (ov_model->preprocess) - ov_preprocess_prepostprocessor_free(ov_model->preprocess); - if (ov_model->compiled_model) - ov_compiled_model_free(ov_model->compiled_model); - if (ov_model->ov_model) - ov_model_free(ov_model->ov_model); - if (ov_model->core) - ov_core_free(ov_model->core); + if (ov_model->preprocess) + ov_preprocess_prepostprocessor_free(ov_model->preprocess); + if (ov_model->compiled_model) + ov_compiled_model_free(ov_model->compiled_model); + if (ov_model->ov_model) + ov_model_free(ov_model->ov_model); + if (ov_model->core) + ov_core_free(ov_model->core); #else - if (ov_model->exe_network) - ie_exec_network_free(&ov_model->exe_network); - if (ov_model->network) - 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); + if (ov_model->exe_network) + ie_exec_network_free(&ov_model->exe_network); + if (ov_model->network) + 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); - } + av_opt_free(&ov_model->ctx); + av_freep(&ov_model); + av_freep(model); } From patchwork Sat Sep 2 08:23:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp55928pzb; Sat, 2 Sep 2023 01:26:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFf1YFhyht9XBbTb1ntSiGwlw7jZth/n28Web0AxiyyBOoNVYqoW02mnM7p9XCLZ3Nj35rF X-Received: by 2002:a17:906:113:b0:99b:4a29:fb6a with SMTP id 19-20020a170906011300b0099b4a29fb6amr3409872eje.59.1693643210295; Sat, 02 Sep 2023 01:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693643210; cv=none; d=google.com; s=arc-20160816; b=fmRBirFgMwNn+BluumPz7or8uh54bmS+fpW/RxRdfd8biwLl/aqE8tH9jNqO40Ooma IyQMejZoeXHU4STyzbme3i0XExlq383fWmjuwali+45LnWWfylv+Rn+LYH9soaodOE5C t0prqc4wu1r+zRVCH4y9NN1bXhdvAWznxdRcSkhVRGDIm48LVxPl2NmBweeysAkZxZer Wm4R27wvLds1DEBdHFt+DlkO9mhgMDu0p4c3w1C82xld5FG/yWx5A3E9P2BwLQ/b6mbP j2GWTh5nZDgIbm6C9rU5KGK+54cHdTf4a5X9sTWdrmybQgWE7EbZyRFYBuL28ZXCF/eV 6a2A== 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=gLkQqBc2GJ1Z1pBpjutWYrIZrj4pEYOz+3z7bgCfNEM=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=sbP6jZhxBHcZJwP692Fifab+EvkbDJkNTff8S0+As8s5BrQNeC8DfSWjvSHnk6T/LN SiQz7pks2Y9iDkXzhkP4+DbTRrU90ZfrR0bLZoeqOHPsWUhoRYc3Je4UVGe2+vnvIcV0 OIqIEsAh3C7SfSiv+Ab377FPzwAVnhGHxYAPputr7nAUO+1rKd4pFN/nhkaWGXNaw61J KNItlKAULOJUOkNRX6B4ss/7rPd6X5UR7LCz9Cw+n2wWfx6tu8TDArvgOSF7loDy+5+E VOYXQZ0/RIA32R2BrJNE82Dk0y3iIy6gTLKLyQagGYBrvV/qmCflWgEMrYgd7qlJ/vaz KPKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=aqEmRuIX; 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 h26-20020a170906829a00b009a1e1f4139bsi3301688ejx.29.2023.09.02.01.26.49; Sat, 02 Sep 2023 01:26:50 -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=aqEmRuIX; 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 E965F68C7F0; Sat, 2 Sep 2023 11:25:26 +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 30EE168C7CA for ; Sat, 2 Sep 2023 11:25:16 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1693643104; bh=42+YSOyYxd9bLStdE1qjM7mvK3hH3pRqNzpdtWq5pOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aqEmRuIXteFpMoNiq2ycCahD8Cj6UDZBWlHtpK6Z1o9KiZaMU2x70IIfd4hpbEaA3 8Epd9680XXTHxMkrAOJPkXNyeHFGu4acmB7QM2eC7NKcsEE3NDShSiHVBOsGSylnFm SQmz0AoB9KHlU6HkkpYEyiObSgZERnR5bzxQAK+E= 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: xmsmtpt1693643103tl50ezvzp Message-ID: X-QQ-XMAILINFO: MYcyYH/A/+tC6LI44gZ8hJAg4HBHYZC3pZyNXK4fJpKrmn6A32n/2SGEY518A2 3QpTkfdMm1qhTWJhJqrCRwSlCdUprLjutcXxs6h8Gha9coaTnEtCslJmuW0la7Jzh5Hl3+5GckkT Z+5+gy2KKnBBx0IS+zU7eyc8Bx5pLo+M6dFwABs9/y1pYaz6FPUsimelmOJ/T08B5nhv7ClZCpk/ O038RFYjQQZhjo+K6xLvu+8s7XWBZqRd8ZBBw7y+RyhxOl94mCasFmkHJFx9bz5oXCFizA6XITpH DZrUvMByPWwduL13mSlQxFbR74/18Xnva25+fErktS5jl355F8CKTgO0xFkZhbu55idQ4540kWL1 Dro1qpgQBEd20+A2HkX95Q9hA1j5SQ1jvl5P7YEGsra88nXiUy9UgfvyKGFbnr4pnc+I3DhouM6K qMl1A66y5QRNkKKBPv2qTUJVB6XbRIEXITiNyEnIPWZaQw82ItG5BVOVOamUJimwUyEA8WxY/u0f ORpEo6BUlSKOcC2W3EZjCBVDMxTWHqpd6QHcJzbTzR0jaV1JcbcfXJCvz5LNg+/gJf8+hKpqJo8z jzLcS/gXUFYvEbGsQzC+M+/kxc3rnPEDmNQl2nWoqqZvrx0j7IbTdS+kNLaFMipd2nzKZY1ADB5i drr2tQbdCy2u1+5Bo6Uynj/Osn6UCaGzE2RY4nA8ZRdNQfwFsyfleUdSIoEW99/5qIC062BFH8CK eME8I306ZMfgVHPCj9pgkoSZ6pZi9SN9Zx/ZFUZfmb6/8G6JpgRTjm+P0cuvpax2Jg00raOpw3fm UHtZEXIzsbvTye8IZeeKejW5BdrlWXS0bdnneeQWYS67IwAt3uct04lJrklhyhwUlaf7eTAl73kJ 7dCBVEswOhj+udFpTqvgunmwOM+tjXjiPDLY3mGq2aTy6SOvCs8XomwytPUFUa3R8WLFGLe8DfeC szO0vCq91OLEkVQZDAYIUZh03pv4UZVCMTHSezEWA= X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 16:23:55 +0800 X-OQ-MSGID: <20230902082359.260925-5-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 4/8] avfilter/dnn_backend_openvino: fix use uninitialized values 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: I2Y2LS2tXJic From: Zhao Zhili Error handling was broken since neither `ret` nor `task` has being initialized on error path. --- libavfilter/dnn/dnn_backend_openvino.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 85db4ecd35..7150bf0886 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -1090,37 +1090,37 @@ static int get_output_ov(void *model, const char *input_name, int input_width, i status = ov_partial_shape_create(4, dims, &partial_shape); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed create partial shape.\n"); - goto err; + return ov2_map_error(status, NULL); } status = ov_const_port_get_shape(ov_model->input_port, &input_shape); input_shape.dims[2] = input_height; input_shape.dims[3] = input_width; if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed create shape for model input resize.\n"); - goto err; + return ov2_map_error(status, NULL); } status = ov_shape_to_partial_shape(input_shape, &partial_shape); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed create partial shape for model input resize.\n"); - goto err; + return ov2_map_error(status, NULL); } status = ov_model_reshape_single_input(ov_model->ov_model, partial_shape); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to reszie model input.\n"); - goto err; + return ov2_map_error(status, NULL); } } else { avpriv_report_missing_feature(ctx, "Do not support dynamic model."); - goto err; + return AVERROR(ENOTSUP); } } status = ov_model_const_output_by_name(ov_model->ov_model, output_name, &ov_model->output_port); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to get output port.\n"); - goto err; + return ov2_map_error(status, NULL); } if (!ov_model->compiled_model) { #else From patchwork Sat Sep 2 08:23:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43459 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp55737pzb; Sat, 2 Sep 2023 01:26:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHv9Mqt24C0whOLmFSyQgZ1OeqfHL6uOro8/MXJo8pSZ7jVyjU2q6XJAf65F03lmxAr1nSI X-Received: by 2002:a17:907:97d0:b0:9a1:c69c:9388 with SMTP id js16-20020a17090797d000b009a1c69c9388mr7923059ejc.37.1693643168421; Sat, 02 Sep 2023 01:26:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693643168; cv=none; d=google.com; s=arc-20160816; b=SsWUvVTh3hyV1aWQaktb9/T30zzT/mVWFczZ8Vt4g+9fx5ewpbHh9hSsC2hlnQmnse XJUDfJslGugIsnkcxV+kPkphgLnnUUFIZ48R2WJMwl92C93D8z7G9XGaT6MDtnfFSugo DVuKSi6o8lrmuUZYpUWFj+btvimA5N+pC3NSffeCr+Na+tDmbmaQPkV3xNb8vDcDRyNE OVQQJlzqlKyfgjB7gjq2AAdoXKB3rXRYRCV0cWLdqMWXPLLnyfelLSN5gC0xu2hVeV1W MyH0aZYzZQmmT3SJI7kJvTNGG7uuWImIqODL0vMyDiDG/nl54UslrUa46tI35PBWPjhB +luQ== 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=br7i6KMblLffXAcQvy1AlmJDuUEMfEpE2xpsikUpdCw=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=l94BAYDNDATGWQDo3HQLAV3X97Q0cB0Y9Hfp4SBOvMrCZfcn/McFpz63NMi/k5RtSR eqV7/wSp1ZkV0eBqg6uSh7blmR0XAo1/py/DCO+xrsUTc6OAfBERTWyBH5B22DnHuJMl odAY14/xD3lkaAq2PMHWmq0pUpyh/QQgYGqOU9oaEYkHRQt8cDUxtgnqbbJA7p9SvK07 ZNPeZazvVWvNV1CjeiS4IeQLDLXzJ873rkDrdCfHRJT7IJ5E5PwNBrXxDa3n8GZIKIIE /UFpXz0loxvEIHG65rMwVg+ZELLQ0tVX0ySFT/EYiSjWsVRlRZGyyxk2wldyTGEaw/u/ 08Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=MnvWQvHn; 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 f3-20020a170906824300b009a2007ad7eesi3135956ejx.362.2023.09.02.01.26.07; Sat, 02 Sep 2023 01:26:08 -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=MnvWQvHn; 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 A574568C7B7; Sat, 2 Sep 2023 11:25:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 346D068C74E for ; Sat, 2 Sep 2023 11:25:11 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1693643104; bh=KDhY6JwRQj08sAcdCszCmKx7sBTs7iZuUTBOTdBjnjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MnvWQvHn1I2E0UAgsFyGywNVOyZ/N1iEwXKoztsph6cnfT34kR8VT3dmq4wgJLOmk Wc6O1dp2mhSqzZnhQM+syZUfKHIgQ0wCMvVNPNeJr1pXvPxjTpCkQJEkGY/z5b3iGJ y7WS85c/Ax0mcQ/p+UiX8Z1p22EoI+/o7m/PLq+Y= 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: xmsmtpt1693643103t73za30d9 Message-ID: X-QQ-XMAILINFO: MyirvGjpKb1j0HDKioeavaGbYAfcz93LIeyxjYuldYqDXgPpIMQ3M13mtNSn3D gMqytIhVT1BqMg/luW6td2uwYtUMJGy1UeRMOu9zUMcQeUCASFu7hX9CHDzWqr0f+AllucJv5GhJ 0iQDeYEvhz4dm4dMO2gBHdSLqVyc2pldAKP1MeS1cvbhx+rd3EiObCpXto58kcR2Xxic63A361vb 3mPIJGkcAyr8gzOtIRxi2382vcRSqHDo8mr8obT8Tmt4dGFeP8rxGGZaznvn7CoOacZrstdYbeZR TcYreChhX6HsSZ9dl9qbsdjtvqh7cZiK3KDQM/rzwCntF1vd9sQUglXN+W1EQwQ31h9J8gknBLxd 5NyeLr4iTiHinlDeGmiW3eGakDgiVzbh0MI3siOdSsoYIy5WrHc7clzjiCLizpkl4g2l8vDFVSp3 vQ439GQ3L1tHbzz/N8TWUOhwbvHilYoIlcd7dAgK/q+vuvS0X7FmbepAggFDTQwvt/JLVmkKi+t3 ITMPSKkqoi6qHT0FWYEStuVLNd8chgLTF0yTJOiTwzV3hGDrpT+rILzZjyU6HmhazddN8Oph5yD7 8lqr6KPgfvUNp+5GTDQSqQLQ9C00TsSbBKNMHiyCqFT3DJ7BY/19yTs40b0OYGn6SRIL1PfFP1MG pnVUb3+bdNsBJr5yq5kJ7Cugi8TvoDoGdX5itJiGL50qSwsyx54i5NwCoGemzYdxenIuMSC39/eH MqhApB/fbumXHMg7yr3lZ+XiG4DVB0N4SYuvBTyMsL+KXpxWpBbs1p4Lt2tj+xPFKDjdNh35SFkr yxVf9g7MuFvwyAY1BPyEHIFrsduAJB3HJT6+RiSXAlooZohKUWV8ScCyjaS/JlQ7ttbF9PKvQFoU 1uP35JA2fkMGUBx0DBBvUO83JI25gcnfFchiVTrfKBpEN+1EhrwgjEbkcHuoAGJlyTAREsv245iq Eju/P1ziQ+8rp2T1SgM64knAsjEbbW06UraNZ1kZd071jvzwXbg+Vaqrvl+Lpcka6FmLf/hJA= X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 16:23:56 +0800 X-OQ-MSGID: <20230902082359.260925-6-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 5/8] avfilter/dnn_backend_openvino: fix leak or ov_core_t on error path 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: PyXagRua5L0i From: Zhao Zhili --- libavfilter/dnn/dnn_backend_openvino.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 7150bf0886..b3910adfc3 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -1213,6 +1213,7 @@ static DNNModel *dnn_load_model_ov(const char *model_filename, DNNFunctionType f if (status != OK) { goto err; } + ov_model->core = core; status = ov_core_read_model(core, model_filename, NULL, &ovmodel); if (status != OK) { @@ -1228,7 +1229,6 @@ static DNNModel *dnn_load_model_ov(const char *model_filename, DNNFunctionType f goto err; } ov_model->ov_model = ovmodel; - ov_model->core = core; #else ov_model->all_input_names = NULL; ov_model->all_output_names = NULL; 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; From patchwork Sat Sep 2 08:23:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43460 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp55787pzb; Sat, 2 Sep 2023 01:26:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZTkXwbUnWkGaPXTK5Z4YPKYtMbN8dJhVkUh7fe+oYxQ/iNKX001chklrcqgtb26x5h3D1 X-Received: by 2002:a05:6402:120c:b0:521:ad49:8493 with SMTP id c12-20020a056402120c00b00521ad498493mr5405049edw.6.1693643178708; Sat, 02 Sep 2023 01:26:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693643178; cv=none; d=google.com; s=arc-20160816; b=jnwECysYNHAC5PEY8mz4d64h4lERdJOH8SJiJgl8x0BKkzarwEjSAAlx3F8J2GYVPS dnc/saNoeZQmbttxg1zQMy+1SeUBy7qd1LUwLYPI/JLMKgQM5TgQqVQmQQ5Yl/DCrB+B VmLzV76gmOxWKgRRPEzWE8ItxVf93pT2TrRlfJVmR0UPJ9eT4kTg7wEyepxTpgQfLFWd 1n6MizvYubdGpJSC6rDq5gLV/yjIKlGvX8WKKgnEUJ+sqnGvyfm5xSQxOLqSrgEvkRZd thGX4LajiwCipETWVhHMmMHIcLo50d1B8MQKMtPuvPvq2LR+dLlj4nKe0ViDW0E+hB98 OH8A== 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=2bPEZgxMzPNh8dDHta2DeLJiyAitSiZH64FYPdcWRmo=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=DlgXcW4//A2gSZQY0NI9OJSOtOvK8tTFDZVJYt0757OfVpX3xrG+qXMEJpgwNVhOfq V3JylFSRHhLiPJ0choZI0ig6X/puWGBVZ4ggEjjCrZcr/oBy+r1WcfxN+aTUNMRxfxRq VDCPPfSRyckZbC9wvP6KRB7AiD//zuw2MA7YYWGaZ9ASThuYiQEYeupJoEKeB11VpD7g fV0BYmg553eUf/+H6hiflNhy6LH9FbWCnRf/I9rzYQA9Jmzj8ErNekyS8ucVprKiYc71 BdRI5Guwy2+wX1jio7R2V4CQApVMXqed4vHJLeKzhBzUuxAaVb3v/6/6tHj/0Qw2PWsO LB6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=WA1Rfuz8; 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 j17-20020aa7ca51000000b0052541d374f8si3579230edt.249.2023.09.02.01.26.18; Sat, 02 Sep 2023 01:26:18 -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=WA1Rfuz8; 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 AAB2168C7DF; Sat, 2 Sep 2023 11:25:23 +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 6811C68C71A 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=dE4yxP3XrTAe4jpz9hi0Lopc8tatLvAUuJ6VJke4S9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WA1Rfuz8BUqW57+y6nHnpgSDU0uPIebq4wSrl8WuJmPeeSH2NG/5wCcRMTFsIX0gr fM6zBcLGv5MtCjf/qJiHu9IKXoP1ptfsRrrLx4amUQqH7W2dgRqaWdnppw7Grk1xTF UONcfmNQeA0WNtrKsUEq4TfHq/6ZV8LBWFyY2bBE= 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: xmsmtpt1693643105tw1x79pdx Message-ID: X-QQ-XMAILINFO: Nfm/+M6ONQ57rr6REcXD6wM7tFVvEsT9L4MTCjRqCOZXzrppWCH8fdsZ14FX4P jJWtWelyqeESb/m8wVfPURduyfw3PAUrm53uyud3ViaYaw8G8R3scdNXMRLwl8hHic7r0HLOQQP9 YmGBPOn+/FhYWgrZwunjnPiOQu4EKk94gK/ZJID8a04Efmr+X/kEe+sQ1n+f9BXsapzdb4zlsVCZ 5Zzzlgvag3grpI0MVaUhJPaajJHovG6RYJTmN5dLSg94XuyEwknLaVtiGzWQ+02Zk45rUxwKII7c bTd9WqpfswKjQ2FOxAFZo7nkO/y6YkB78mLxlVjDluek0/A9DMrRngqVh0vn9QxMvEIYx/HDGS1d idoUseidWQsACPh4PyzarnKPDrRftzT4qpSigFsd3xAGFWGUauZGdHYbwCDdBeijJ/6DFOPpHSJ/ ebKulM8i/4as+QZOSn4c2a/Y3vTjxCojH6D31ZKpSGQQmaEJ1cW/AUY78ePcFW5MrY9zVIf4cl2e +4XKDFnSeLSlskX73rFxQsZX2TrPhhMZKWW1DVOKhsd7i42oqyT/cQ91BgrL+C2dtvq4BUZ01Gb7 RbyUJJmAS3vU9bBE1EDu9umIMRCbFWBQLAvnN8Hpn/f3rAObf5faEuE//k2hPMCCyYeqKFmPwxmk J0ft5tD4TdCoFp/Pov01vDXG1UIAWvjfc+hBiSdiv7YeQBA2yao0VtyEI2h3sUKH8EXbIF81zQHs 6S7l10nxJlh7rmUJgNaMofZKRAPsU9jlGuPE2aKLxRiMYpYfEdJbVx5R15lE/SpuN/Kt8qpgimlu ROaPfdrUTh4wXLeJQpIobnIjGADxdYpyLKUriLb5mJglk3pdQO4OqR+Him1jKYS6p3WPr5/bZBAQ dCtw9bZDnjVJSSwvoMET0I9QJrfNv2P/4i9di/Ie5Aef7JZ7baTZKqOJqWc3vVw9Z1vaoKW5cVD2 o4ctOITEte/Wlq0KTuqjwO6xz0F4o/LZi5Ib4vlq8WwnKa+noCDonJKElncaRtgQSa2b4R0faEb4 CoqB+Z4Dd+xEXIE9Gh X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 16:23:58 +0800 X-OQ-MSGID: <20230902082359.260925-8-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 7/8] avfilter/dnn_backend_openvino: fix input_port/output_port leaks 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: 55fNHhi1wSDI From: Zhao Zhili --- 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 f9944211da..5de27719b2 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -503,6 +503,10 @@ static void dnn_free_model_ov(DNNModel **model) } ff_queue_destroy(ov_model->task_queue); #if HAVE_OPENVINO2 + if (ov_model->input_port) + ov_output_const_port_free(ov_model->input_port); + if (ov_model->output_port) + ov_output_const_port_free(ov_model->output_port); if (ov_model->preprocess) ov_preprocess_prepostprocessor_free(ov_model->preprocess); if (ov_model->compiled_model) From patchwork Sat Sep 2 08:23:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43456 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp55883pzb; Sat, 2 Sep 2023 01:26:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH82a7R1Bx6Exg1paGFEJaEeKRWvtALGY8wowLTQizm0+NqdS4p17v0IOTVyhbKPPAwHdIv X-Received: by 2002:a17:906:20dd:b0:9a5:d657:47e6 with SMTP id c29-20020a17090620dd00b009a5d65747e6mr2924832ejc.56.1693643198864; Sat, 02 Sep 2023 01:26:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693643198; cv=none; d=google.com; s=arc-20160816; b=MH1TBdgWHKYL/pRJUzDC4r0lKrR8XaY5kRuh/f1YzgNIjYJ4grXIqFcCW2jCN2jjFj PxCCuD5qpc6aLR+rsrMylK1YLf/zoWxx0+mdgS+6fmVLG1qHBhxTd41gN7XbPXI4ZZJ/ BGmJG+g0DP1Tqok8E+fCd71ZQ+gMVaRqunhuAFZDFt5Fbkj3/GbPwkbfvQB/vBOG0cis GJoOkyl69C03xa4uTzdJJGuOgM0HCxmbW0uHmugoTT1zfsMCXaHYnKWQ2kXB8FMqE2ON baP1EFPudQyrE9f5kgjSL6hQZJpPEG9GZPntkcHrcI+o1sNjqJHWneh9lcDyMRhgguAG Wj3w== 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=OOGsGJ3wUsOqWG0Gv5X0+FjK55DwbEQ/H4iNsPqqCMQ=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=dADF9hBnwW7Sth09rJDLc7nWPkQFbqEln9LtYaxSZvWtgyhWba6ia/sPur2IRIkdYs K9aGwI16dxcU+mgJmaATox8ca7BBQV69iglCrFms67q6KNBp4zVVoWv20L8UhCyqe2Wv d6g8os5G18Z2K+kYRJmTmLVd7eJk9+7BG+kP+Cp9PvHHulE4CBecsp/vQE0JvGydRNiG WXIh6VmWi7DWmclASSeHIosFlORQRPjLQCCbynAZliygNrIakFEVV9BnPtT4bRiiOopD dl3ZOoLmpYxgeRTaVqfJv+Jcs0r8uYLuPizAwclbwOnOtM+8njf91TNcXQ1woEYl7gQS AEdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=h3RYjt6K; 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 lm19-20020a170906981300b009a190ce8511si3571431ejb.111.2023.09.02.01.26.38; Sat, 02 Sep 2023 01:26:38 -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=h3RYjt6K; 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 E12A768C7E9; Sat, 2 Sep 2023 11:25:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C69A968C7AD for ; Sat, 2 Sep 2023 11:25:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1693643106; bh=dXF/MGtO8wrR6HW52ptDyimxAW0baWuyFiQii6DbiVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h3RYjt6KP0IhD0HvyIZVoFu2HzXLy+llvZiBdgi7v3zhqafAusVcaOVJRI0xsVY8E NAED4n+/X2i3pNTkALGTcoJJ7wgs/HsBhaaanpvaYMOzXe0yPCrj00qvUowX7YGSxP j0Rych1zvQfHnXCnM/GBzWkpbcXfsFB8dLG5w9KM= 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: xmsmtpt1693643105tbkdps0gd Message-ID: X-QQ-XMAILINFO: MPEorwW6cFo9h+sXpRkYrO/HOO9cd6muvLGvRep2t9wmgA8m0RNM19+FrYEZzq +d4xsuIp5VzsNRzeC+Z4MgMRv7EUSCRmtlN5c0PagdVHqyVBpjIaT3BizKj1+gHJa9zJ5RtLlgzh yZaWq3nZhvsYAE+gaYNc1pjdgna6zxM/5pb1oU4YwpfstwJQb1mKHSsMYJxrv4/LhWcedt2oByTh NWv15mPWJgHykunI7OE0z9gvkK9Wk5L6h1RRHSC6f7qg0nCIvep0dA3IvAb1lduJjUJclvirgZZE rxSPrW3MuOSA9O1xOel2AFRGaf6UsKQhL/TQNeaHaZuQPl4Ku8XiNbGmg1wc3CLE8QpKPLkavacJ jz6s7LhlflLRJ0PdXE5dLJfLppO27bkYYwW2aMVgpWxGyXFjDGEBtV5ArIGP/dH64OcUBaglODI3 sGKomrZdw3p4tLclzGE40yJMbo0qvozI0qUiWavroW8n4qjGUC8QR7EWGtmiejcV1IxphNdJT8E9 PiikixXXnbYM8pLgdz/6uvD1ugvwsjAWEGs7WQCAQ3e/Noow8HmJx9ZvpKTs9W4N+1AYQoa8Sqge 0tfNdHXUzg2+XXcdLi0ntgFszFLK99HjAPePmCsAHD8/gPsHkOas1NjVo+Aote+ejNpnAedt4UkX 0VUZHaxeZzUpNyKVn//wTBswYuuORSkpeAh/dAaDggnPg38TerJhH5pd4k61Ssw/bb/ad1bNKhy1 +xdqYKLBLSeZrNtorvNQwgUcmyoLDKgi89oUHG0fyAtIE0Fp5py1qc3a+ezP8hFN6WqlSt6+pPPA mYAwJ8+LruRw41hdBnUj9BJoSiHGFMAPuj2VuLIC+Iywi4HJOjVw2yPRq3s/RYndWYHzziCyM9Ci G/O0IR3OON730J4SiF6Ho8c+NNnw+yZkNqSiOxjkdx8HoX3DMS9Mv4dTfvtAzyVJNR2cVvOi62FD Clb6AMyv4L/fl6daa4vKh3Q6dH5VHxNC0hqhgrxQ4O/DDK2UyAdG6UTly54ylbQcmgSEwTVKX2X6 YvGSMm/A== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 16:23:59 +0800 X-OQ-MSGID: <20230902082359.260925-9-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 8/8] avfilter/dnn_backend_openvino: fix wild pointer on error path 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: mk3xVwgPyGFH From: Zhao Zhili When ov_model_const_input_by_name/ov_model_const_output_by_name failed, input_port/output_port can be wild pointer. Signed-off-by: Zhao Zhili --- 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 5de27719b2..ded156289b 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -210,7 +210,10 @@ static int fill_model_input_ov(OVModel *ov_model, OVRequestItem *request) #if HAVE_OPENVINO2 if (!ov_model_is_dynamic(ov_model->ov_model)) { - ov_output_const_port_free(ov_model->input_port); + if (ov_model->input_port) { + ov_output_const_port_free(ov_model->input_port); + ov_model->input_port = NULL; + } status = ov_model_const_input_by_name(ov_model->ov_model, task->input_name, &ov_model->input_port); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to get input port shape.\n"); @@ -621,8 +624,10 @@ static int init_model_ov(OVModel *ov_model, const char *input_name, const char * ov_model_free(tmp_ov_model); //update output_port - if (ov_model->output_port) + if (ov_model->output_port) { ov_output_const_port_free(ov_model->output_port); + ov_model->output_port = NULL; + } status = ov_model_const_output_by_name(ov_model->ov_model, output_name, &ov_model->output_port); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to get output port.\n");