From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 2/6] qemu-img convert: Free @sn_opts in all error cases
Date: Tue, 3 Nov 2020 16:26:54 +0100 [thread overview]
Message-ID: <20201103152658.119563-3-kwolf@redhat.com> (raw)
In-Reply-To: <20201103152658.119563-1-kwolf@redhat.com>
From: Tuguoyi <tu.guoyi@h3c.com>
@sn_opts is initialized at the beginning, so it should be deleted
after jumping to the lable 'fail_getopt'
Signed-off-by: Guoyi Tu <tu.guoyi@h3c.com>
Message-Id: <6ff1c5d372944494be3932274f75485d@h3c.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-img.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qemu-img.c b/qemu-img.c
index a968c74cba..c2c56fc797 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2751,7 +2751,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) {
@@ -2763,6 +2762,7 @@ out:
g_free(s.src_sectors);
g_free(s.src_alignment);
fail_getopt:
+ qemu_opts_del(sn_opts);
g_free(options);
return !!ret;
--
2.28.0
next prev parent reply other threads:[~2020-11-03 15:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 15:26 [PULL 0/6] Block layer patches Kevin Wolf
2020-11-03 15:26 ` [PULL 1/6] qmp: fix aio_poll() assertion failure on Windows Kevin Wolf
2020-11-03 15:26 ` Kevin Wolf [this message]
2020-11-03 15:26 ` [PULL 3/6] iotests.py: Fix type check errors in wait_migration() Kevin Wolf
2020-11-03 15:26 ` [PULL 4/6] iotests: Disable unsubscriptable-object in pylint Kevin Wolf
2020-11-03 15:26 ` [PULL 5/6] iotests: Use Python 3 style super() Kevin Wolf
2020-11-03 15:26 ` [PULL 6/6] block/vvfat: Fix bad printf format specifiers Kevin Wolf
2020-11-03 16:53 ` [PULL 0/6] Block layer patches Peter Maydell
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=20201103152658.119563-3-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).