From nobody Fri May 17 10:13:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1604307992; cv=none; d=zohomail.com; s=zohoarc; b=PqH7YQDYRWFqUZ+RE7gjFT7BkF0dphue7eOwvQfaay2kPn3ig1VL2akXSLH+0sMW8asK3KvdjQ+HlP/c7vNlgD5/zkMtUgaE3CLc/sYLgQ8VfkV10HLmv9e4/tAKgPIg8Lup37v2uQWGqdfHYutMUE1wSU2c5+QJF6miyIlpIFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604307992; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=VeRpXQ1FrQZISlL7B6okJc0EkT2ZchJMk+nYF3IC9gk=; b=GxhQFVu7SKPwsWiOa2H3OFyf98OKhY7qx4uNYb54eaAv0KB5mI62gPS1Bqewn6xUVr+No9kovi4FL/96+QQznwRD1pZQDNZxFbRup5+mhSQv212aJnajE5u0ZQ8YJaGFWT9fgAD3ms5auRteW6Om5N2w5jMYI0xuoOFAEXuNECM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604307992421375.92553632189833; Mon, 2 Nov 2020 01:06:32 -0800 (PST) Received: from localhost ([::1]:52326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZVnJ-0000OO-VG for importer@patchew.org; Mon, 02 Nov 2020 04:06:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZVmI-0008Cu-LT; Mon, 02 Nov 2020 04:05:26 -0500 Received: from smtp.h3c.com ([60.191.123.56]:9764 helo=h3cspam01-ex.h3c.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZVmE-0007OD-O9; Mon, 02 Nov 2020 04:05:25 -0500 Received: from DAG2EX02-BASE.srv.huawei-3com.com ([10.8.0.65]) by h3cspam01-ex.h3c.com with ESMTPS id 0A294sHu037680 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 2 Nov 2020 17:04:54 +0800 (GMT-8) (envelope-from tu.guoyi@h3c.com) Received: from DAG2EX03-BASE.srv.huawei-3com.com (10.8.0.66) by DAG2EX02-BASE.srv.huawei-3com.com (10.8.0.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Mon, 2 Nov 2020 17:04:57 +0800 Received: from DAG2EX03-BASE.srv.huawei-3com.com ([fe80::5d18:e01c:bbbd:c074]) by DAG2EX03-BASE.srv.huawei-3com.com ([fe80::5d18:e01c:bbbd:c074%7]) with mapi id 15.01.2106.002; Mon, 2 Nov 2020 17:04:57 +0800 From: Tuguoyi To: "kwolf@redhat.com" , "mreitz@redhat.com" , "qemu-block@nongnu.org" Subject: [PATCH] qemu-img: Make sure @sn_opts can be deleted in all error cases Thread-Topic: [PATCH] qemu-img: Make sure @sn_opts can be deleted in all error cases Thread-Index: Adaw9yiaXCeh3bnoRzW4v9HKxcO/5A== Date: Mon, 2 Nov 2020 09:04:57 +0000 Message-ID: <6ff1c5d372944494be3932274f75485d@h3c.com> Accept-Language: en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.125.108.131] x-sender-location: DAG2 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-DNSRBL: X-MAIL: h3cspam01-ex.h3c.com 0A294sHu037680 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=60.191.123.56; envelope-from=tu.guoyi@h3c.com; helo=h3cspam01-ex.h3c.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/02 04:05:07 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "qemu-devel@nongnu.org" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" @sn_opts is initialized at the beginning, so it should be deleted after jumping to the lable 'fail_getopt' Signed-off-by: Guoyi Tu --- qemu-img.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-img.c b/qemu-img.c index 2103507..229cdf9 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2719,7 +2719,6 @@ out: qemu_progress_end(); qemu_opts_del(opts); qemu_opts_free(create_opts); - qemu_opts_del(sn_opts); qobject_unref(open_opts); blk_unref(s.target); if (s.src) { @@ -2731,6 +2730,7 @@ out: g_free(s.src_sectors); g_free(s.src_alignment); fail_getopt: + qemu_opts_del(sn_opts); g_free(options); =20 return !!ret; --=20 2.7.4 -- Best regards, Guoyi