From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSWVi-0005O8-TG for qemu-devel@nongnu.org; Tue, 25 Mar 2014 14:55:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSWVb-0007NS-VT for qemu-devel@nongnu.org; Tue, 25 Mar 2014 14:55:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSWVb-0007MK-EZ for qemu-devel@nongnu.org; Tue, 25 Mar 2014 14:55:35 -0400 From: Stefan Hajnoczi Date: Tue, 25 Mar 2014 15:49:29 +0100 Message-Id: <1395758972-11050-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1395758972-11050-1-git-send-email-stefanha@redhat.com> References: <1395758972-11050-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.0 2/5] qemu-img: mandate argument to 'qemu-img check --repair' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Prasad Joshi , Stefan Hajnoczi , Anthony Liguori From: Prasad Joshi qemu-img check --repair option accepts an argument. The argument to --repair switch can either be 'all' or 'leak'. Fix the long option to mandate argument with --repair switch. The patch fixes following segmentation fault Core was generated by `qemu-img check -f qcow2 --repair all t.qcow2'. Program terminated with signal 11, Segmentation fault. 0 in img_check (argc=6, argv=0x7fffab9b8a10) at qemu-img.c:588 588 if (!strcmp(optarg, "leaks")) { (gdb) bt 0 img_check (argc=6, argv=0x7fffab9b8a10) at qemu-img.c:588 1 __libc_start_main () from /lib/x86_64-linux-gnu/libc.so.6 2 _start () (gdb) Signed-off-by: Prasad Joshi Reviewed-by: Leandro Dorileo Reviewed-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- qemu-img.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-img.c b/qemu-img.c index 2e40cc1..77d946b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -565,7 +565,7 @@ static int img_check(int argc, char **argv) static const struct option long_options[] = { {"help", no_argument, 0, 'h'}, {"format", required_argument, 0, 'f'}, - {"repair", no_argument, 0, 'r'}, + {"repair", required_argument, 0, 'r'}, {"output", required_argument, 0, OPTION_OUTPUT}, {0, 0, 0, 0} }; -- 1.8.5.3