From 16a4d4352c762f6035e1a39f619d358ba7688502 Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Fri, 16 Sep 2011 15:03:32 +0530 Subject: cli: if the create volume command does not contain bricks, exit gracefully Change-Id: I41f896d5a9c514994874b6e4e956d38fed742d4b BUG: 3571 Reviewed-on: http://review.gluster.com/438 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi --- cli/src/cli-cmd-parser.c | 5 +++++ cli/src/registry.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'cli') diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 8ea6581af..92626df76 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -320,6 +320,11 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options /* reset the count value now */ count = 1; + if (index >= wordcount) { + ret = -1; + goto out; + } + brick_index = index; ret = cli_cmd_bricks_parse (words, wordcount, brick_index, &bricks, diff --git a/cli/src/registry.c b/cli/src/registry.c index 3bdc8929a..5b63e82b1 100644 --- a/cli/src/registry.c +++ b/cli/src/registry.c @@ -268,7 +268,7 @@ cli_getunamb (const char *tok, void **choices, cli_selector_t sel) unsigned mn = 0; void *ret = NULL; - if (!choices || !*tok) + if (!choices || !tok || !*tok) return NULL; for (wcon = choices; *wcon; wcon++) { -- cgit