Commit e814dffc authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

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: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Cc: qemu-stable <qemu-stable@nongnu.org>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent bdd03cdf

qemu-img.c

+2 −1
Original line number Diff line number Diff line
@@ -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);