From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRqqf-0003sV-Ow for qemu-devel@nongnu.org; Tue, 18 Aug 2015 20:03:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRqqe-0002hR-Vf for qemu-devel@nongnu.org; Tue, 18 Aug 2015 20:03:21 -0400 From: Max Reitz Date: Tue, 18 Aug 2015 17:03:12 -0700 Message-Id: <1439942592-28888-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH] qemu-img: Fix crash in amend invocation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , Max Reitz , qemu-devel@nongnu.org, qemu-stable@nongnu.org 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 Cc: qemu-stable Signed-off-by: Max Reitz --- 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); -- 2.4.3