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;