[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH] qemu-img: Fix crash in amend invocation

From: Max Reitz
Subject: [Qemu-devel] [PATCH] qemu-img: Fix crash in amend invocation
Date: Tue, 18 Aug 2015 17:03:12 -0700

$ ./qemu-img create -f qcow2 /tmp/t.qcow2 64M
$ ./qemu-img amend -f qcow2 -o backing_file=/tmp/t.qcow2, -o help \

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 <address@hidden>
Cc: qemu-stable <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
 qemu-img.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c
index 75f4ee4..3ddb391 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2930,8 +2930,7 @@ static int img_amend(int argc, char **argv)
             case 'o':
                 if (!is_valid_option_list(optarg)) {
                     error_report("Invalid option list: %s", optarg);
-                    ret = -1;
-                    goto out;
+                    return 1;
                 if (!options) {
                     options = g_strdup(optarg);

reply via email to

[Prev in Thread] Current Thread [Next in Thread]