diff options
| author | Carlos Martín Nieto <cmn@elego.de> | 2012-11-15 18:10:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-16 02:12:17 (GMT) |
| commit | 962c38eedd931a608b5e675f12a21569d9f4d39f (patch) | |
| tree | e5c46cb797bf1d26020a9350050d54ce9797e8ac | |
| parent | 889d35899ba64640e47798681ecb34a4be043bad (diff) | |
| download | git-962c38eedd931a608b5e675f12a21569d9f4d39f.zip git-962c38eedd931a608b5e675f12a21569d9f4d39f.tar.gz git-962c38eedd931a608b5e675f12a21569d9f4d39f.tar.bz2 | |
config: don't segfault when given --path with a missing value
When given a variable without a value, such as '[section] var' and
asking git-config to treat it as a path, git_config_pathname returns
an error and doesn't modify its output parameter. show_config assumes
that the call is always successful and sets a variable to indicate
that vptr should be freed. In case of an error however, trying to do
this will cause the program to be killed, as it's pointing to memory
in the stack.
Detect the error and return immediately to avoid freeing or accessing
the uninitialed memory in the stack.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/config.c | 3 | ||||
| -rwxr-xr-x | t/t1300-repo-config.sh | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/builtin/config.c b/builtin/config.c index 8cd08da..a8cf1af 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -129,7 +129,8 @@ static int show_config(const char *key_, const char *value_, void *cb) else sprintf(value, "%d", v); } else if (types == TYPE_PATH) { - git_config_pathname(&vptr, key_, value_); + if (git_config_pathname(&vptr, key_, value_) < 0) + return -1; must_free_vptr = 1; } else if (value_) { vptr = value_; diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index a477453..17272e0 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -803,6 +803,11 @@ test_expect_success NOT_MINGW 'get --path copes with unset $HOME' ' test_cmp expect result ' +test_expect_success 'get --path barfs on boolean variable' ' + echo "[path]bool" >.git/config && + test_must_fail git config --get --path path.bool +' + cat > expect << EOF [quote] leading = " test" |