[PATCH 4/7] setup: make sure git dir path is in a permanent buffer
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Oct 2, 2010, 08:36 UTC
- Message-ID
- <20101002083652.GE29638@burratino>
- In-Reply-To
- <20101002082752.GA29638@burratino>
If setup_git_env() is run before the usual repository discovery sequence and .git is a file with the text
gitdir: <path>
(with <path> any string) then the in-core git_dir variable is set to the result of converting <path> to an absolute path using make_absolute_path().
Unfortunately make_absolute_path() returns its result in a static buffer that is overwritten by later calls. Such a call could cause later accesses to git_dir (from git_pathdup(), for example) to read the wrong path, leaving git very confused.
It is not obvious whether any existing code in git will trigger the problem, but in any case, it is worth a few dozen bytes to copy the return value from make_absolute_path() for some added peace of mind.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- environment.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/environment.c b/environment.c index c44a30b..de5581f 100644 --- a/environment.c +++ b/environment.c @@ -87,8 +87,10 @@ const char * const local_repo_env[LOCAL_REPO_ENV_SIZE + 1] = { static void setup_git_env(void) { git_dir = getenv(GIT_DIR_ENVIRONMENT); - if (!git_dir) + if (!git_dir) { git_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT); + git_dir = git_dir ? xstrdup(git_dir) : NULL; + } if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT; git_object_dir = getenv(DB_ENVIRONMENT);
-- 1.7.2.3