qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
	"Benoît Canet" <benoit@irqsave.net>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v2 3/7] qemu-img: Fix insignificant memleak
Date: Sat,  2 Aug 2014 01:49:17 +0200	[thread overview]
Message-ID: <1406936961-20356-4-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1406936961-20356-1-git-send-email-mreitz@redhat.com>

As soon as options is set in img_amend(), it needs to be freed before
the function returns. This leak is rather insignificant, as qemu-img
will exit subsequently anyway, but there's no point in not fixing it.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
---
 qemu-img.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qemu-img.c b/qemu-img.c
index 4b6406b..0bd8fa5 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2808,7 +2808,9 @@ static int img_amend(int argc, char **argv)
     }
 
     if (optind != argc - 1) {
-        error_exit("Expecting one image file name");
+        error_report("Expecting one image file name");
+        ret = -1;
+        goto out;
     }
 
     flags = BDRV_O_FLAGS | BDRV_O_RDWR;
-- 
2.0.3

  parent reply	other threads:[~2014-08-01 23:49 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-01 23:49 [Qemu-devel] [PATCH v2 0/7] block/qcow2: Improve zero cluster expansion Max Reitz
2014-08-01 23:49 ` [Qemu-devel] [PATCH v2 1/7] block: Add status callback to bdrv_amend_options() Max Reitz
2014-08-04  9:19   ` Benoît Canet
2014-08-05 13:03   ` Eric Blake
2014-08-15 11:10   ` Benoît Canet
2014-08-01 23:49 ` [Qemu-devel] [PATCH v2 2/7] qemu-img: Add progress output for amend Max Reitz
2014-08-04  9:21   ` Benoît Canet
2014-08-05 13:04   ` Eric Blake
2014-08-15 11:18   ` Benoît Canet
2014-08-15 13:06     ` Max Reitz
2014-08-15 13:30       ` Benoît Canet
2014-08-01 23:49 ` Max Reitz [this message]
2014-08-01 23:49 ` [Qemu-devel] [PATCH v2 4/7] block/qcow2: Implement status CB " Max Reitz
2014-08-04  9:29   ` Benoît Canet
2014-08-05 13:11   ` Eric Blake
2014-08-15 11:26   ` Benoît Canet
2014-08-01 23:49 ` [Qemu-devel] [PATCH v2 5/7] block/qcow2: Make get_refcount() global Max Reitz
2014-08-04  9:31   ` Benoît Canet
2014-08-05 13:18   ` Eric Blake
2014-08-15 11:27   ` Benoît Canet
2014-08-01 23:49 ` [Qemu-devel] [PATCH v2 6/7] block/qcow2: Simplify shared L2 handling in amend Max Reitz
2014-08-04  9:32   ` Benoît Canet
2014-08-05 13:27   ` Eric Blake
2014-08-15 11:50   ` Benoît Canet
2014-08-01 23:49 ` [Qemu-devel] [PATCH v2 7/7] iotests: Expand test 061 Max Reitz
2014-08-05 13:28   ` Eric Blake
2014-08-15 11:52   ` Benoît Canet

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=1406936961-20356-4-git-send-email-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=benoit@irqsave.net \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.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
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).