| Message ID | 1440111638-30188-1-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/20/2015 04:00 PM, Max Reitz wrote: > 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> > --- > v2: > - Fix leak introduced by trying to be clever [Eric] > (thank you for catching this!) > --- > qemu-img.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Eric Blake <eblake@redhat.com>
Am 21.08.2015 um 01:00 hat Max Reitz geschrieben: > 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> > --- > v2: > - Fix leak introduced by trying to be clever [Eric] > (thank you for catching this!) Thanks, applied to the block branch. Kevin
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);
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> --- v2: - Fix leak introduced by trying to be clever [Eric] (thank you for catching this!) --- qemu-img.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)