diff options
| author | Raghavendra Bhat <raghavendrabhat@gluster.com> | 2011-09-16 15:03:32 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-09-18 22:04:00 -0700 |
| commit | 16a4d4352c762f6035e1a39f619d358ba7688502 (patch) | |
| tree | 98a3b77160b1f085c585f3bd4640d3ca12b379d7 | |
| parent | 4ee093305a0237368118e425723792a028b02a94 (diff) | |
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 <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amar@gluster.com>
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 5 | ||||
| -rw-r--r-- | cli/src/registry.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 8ea6581aff8..92626df76b5 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 3bdc8929abb..5b63e82b164 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++) { |