commit b2f27e4438bb9eb302a0976e5b988bdfd55e65dc
author Max Reitz <mreitz@redhat.com> Mon Oct 27 11:12:52 2014 +0100
committer Stefan Hajnoczi <stefanha@redhat.com> Mon Nov 03 11:41:49 2014 +0000
tree b0b12bf9c968739ca5f03c6e057e23299eb3977a
parent 76a3a34dcefbaac3103148e9c3437749b0732cfe

qemu-img: Fix insignificant memleak

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>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
Message-id: 1414404776-4919-4-git-send-email-mreitz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

qemu-img.c

diff --git a/qemu-img.c b/qemu-img.c
index c7b394a..66a7eb4 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2948,7 +2948,9 @@
     }
 
     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;