Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
submodule: fix segmentation fault in submodule--helper clone
The git submodule--helper clone command will fail with a segmentation
fault when given a null url or null path variable. Since these are
required for proper functioning of the submodule--helper clone
subcommand, add checks to prevent running and fail gracefully when
missing.

Update the usage string to reflect the requirement that the --url and
--path "options" are required.

Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jacob Keller authored and Junio C Hamano committed Mar 1, 2016
1 parent 717416c commit 7dad263
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions builtin/submodule--helper.c
Expand Up @@ -186,15 +186,15 @@ static int module_clone(int argc, const char **argv, const char *prefix)

const char *const git_submodule_helper_usage[] = {
N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
"[--reference <repository>] [--name <name>] [--url <url>]"
"[--depth <depth>] [--path <path>]"),
"[--reference <repository>] [--name <name>] [--depth <depth>] "
"--url <url> --path <path>"),
NULL
};

argc = parse_options(argc, argv, prefix, module_clone_options,
git_submodule_helper_usage, 0);

if (argc)
if (argc || !url || !path)
usage_with_options(git_submodule_helper_usage,
module_clone_options);

Expand Down

0 comments on commit 7dad263

Please sign in to comment.