From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpgxJ-0002Oe-P1 for qemu-devel@nongnu.org; Sun, 08 Dec 2013 11:11:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VpgxD-0005iv-Tv for qemu-devel@nongnu.org; Sun, 08 Dec 2013 11:11:41 -0500 Received: from mail-pb0-x22e.google.com ([2607:f8b0:400e:c01::22e]:45608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpgxD-0005ih-MZ for qemu-devel@nongnu.org; Sun, 08 Dec 2013 11:11:35 -0500 Received: by mail-pb0-f46.google.com with SMTP id md12so3864702pbc.19 for ; Sun, 08 Dec 2013 08:11:34 -0800 (PST) From: Liu Yuan Date: Mon, 9 Dec 2013 00:11:20 +0800 Message-Id: <1386519080-25906-1-git-send-email-namei.unix@gmail.com> Subject: [Qemu-devel] [PATCH] sheepdog: check if '-o redundancy' is passed from user List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: sheepdog@lists.wpkg.org Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi This fix a segfault (that is caused by b3af018f3) of following command: $ qemu-img convert some_img sheepdog:some_img Cc: qemu-devel@nongnu.org Cc: Kevin Wolf Cc: Stefan Hajnoczi Signed-off-by: Liu Yuan --- block/sheepdog.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index b4ae50f..d1c812d 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1666,9 +1666,11 @@ static int sd_create(const char *filename, QEMUOptionParameter *options, goto out; } } else if (!strcmp(options->name, BLOCK_OPT_REDUNDANCY)) { - ret = parse_redundancy(s, options->value.s); - if (ret < 0) { - goto out; + if (options->value.s) { + ret = parse_redundancy(s, options->value.s); + if (ret < 0) { + goto out; + } } } options++; -- 1.7.9.5