aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2015-08-20 16:00:38 -0700
committerKevin Wolf <kwolf@redhat.com>2015-09-04 20:59:48 +0200
commite814dffcc9810ed77fe99081be9751b620a894c4 (patch)
tree181bb72a2bd72e9ab06ae00ca79a2a370097ea50
parentbdd03cdf5dc3176bc7169a1d5709303e9279fffb (diff)
downloadqemu-e814dffcc9810ed77fe99081be9751b620a894c4.zip
qemu-e814dffcc9810ed77fe99081be9751b620a894c4.tar.gz
qemu-e814dffcc9810ed77fe99081be9751b620a894c4.tar.bz2
qemu-img: Fix crash in amend invocation
Example: $ ./qemu-img create -f qcow2 /tmp/t.qcow2 64M $ ./qemu-img amend -f qcow2 -o backing_file=/tmp/t.qcow2, -o help \ /tmp/t.qcow2 This should not crash. This actually is tested by iotest 082, but not caught due to the segmentation fault being silent (which is something that needs to be fixed, too). Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Cc: qemu-stable <qemu-stable@nongnu.org> Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--qemu-img.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/qemu-img.c b/qemu-img.c
index 75f4ee4..6ff4e85 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2931,7 +2931,7 @@ static int img_amend(int argc, char **argv)
if (!is_valid_option_list(optarg)) {
error_report("Invalid option list: %s", optarg);
ret = -1;
- goto out;
+ goto out_no_progress;
}
if (!options) {
options = g_strdup(optarg);
@@ -3031,6 +3031,7 @@ static int img_amend(int argc, char **argv)
out:
qemu_progress_end();
+out_no_progress:
blk_unref(blk);
qemu_opts_del(opts);
qemu_opts_free(create_opts);