summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Müller <wolf@oriole.systems>2021-05-17 08:02:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-05-17 09:39:29 (GMT)
commit99fc555188681caeedc983b9fc982d6dc8ee2a8c (patch)
treec572e55b79db540fe660e753a8c9d9a606b28203
parent48bf2fa8bad054d66bd79c6ba903c89c704201f7 (diff)
downloadgit-99fc555188681caeedc983b9fc982d6dc8ee2a8c.zip
git-99fc555188681caeedc983b9fc982d6dc8ee2a8c.tar.gz
git-99fc555188681caeedc983b9fc982d6dc8ee2a8c.tar.bz2
rev-parse: fix segfault with missing --path-format argument
Calling "git rev-parse --path-format" without an argument segfaults instead of giving an error message. Commit fac60b8925 (rev-parse: add option for absolute or relative path formatting, 2020-12-13) added the argument parsing code but forgot to handle NULL. Returning an error makes sense here because there is no default value we could use. Add a test case to verify. Signed-off-by: Wolfgang Müller <wolf@oriole.systems> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/rev-parse.c2
-rwxr-xr-xt/t1500-rev-parse.sh4
2 files changed, 6 insertions, 0 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 85bad90..7af8dab 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -759,6 +759,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
continue;
}
if (opt_with_value(arg, "--path-format", &arg)) {
+ if (!arg)
+ die("--path-format requires an argument");
if (!strcmp(arg, "absolute")) {
format = FORMAT_CANONICAL;
} else if (!strcmp(arg, "relative")) {
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
index deae916..1c2df08 100755
--- a/t/t1500-rev-parse.sh
+++ b/t/t1500-rev-parse.sh
@@ -146,6 +146,10 @@ test_expect_success '--path-format can change in the middle of the command line'
test_cmp expect actual
'
+test_expect_success '--path-format does not segfault without an argument' '
+ test_must_fail git rev-parse --path-format
+'
+
test_expect_success 'git-common-dir from worktree root' '
echo .git >expect &&
git rev-parse --git-common-dir >actual &&