path: root/setup.c
diff options
authorJeff King <>2017-09-05 13:05:01 (GMT)
committerJunio C Hamano <>2017-09-06 09:06:26 (GMT)
commit1fb2b636c672fea06fdc5f50d5c0ed44117ae45a (patch)
tree5569c294402e712b73b4e4743d3bc9518a75a3ca /setup.c
parentf9b7573f6b0039d298de826e22c636db79b9c919 (diff)
set_git_dir: handle feeding gitdir to itself
Ideally we'd free the existing gitdir field before assigning the new one, to avoid a memory leak. But we can't do so safely because some callers do the equivalent of: set_git_dir(get_git_dir()); We can detect that case as a noop, but there are even more complicated cases like: set_git_dir(remove_leading_path(worktree, get_git_dir()); where we really do need to do some work, but the original string must remain valid. Rather than put the burden on callers to make a copy of the string (only to free it later, since we'll make a copy of it ourselves), let's solve the problem inside set_git_dir(). We can make a copy of the pointer for the old gitdir, and then avoid freeing it until after we've made our new copy. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'setup.c')
1 files changed, 0 insertions, 5 deletions
diff --git a/setup.c b/setup.c
index 2395017..6d8380a 100644
--- a/setup.c
+++ b/setup.c
@@ -399,11 +399,6 @@ void setup_work_tree(void)
- /*
- * NEEDSWORK: this call can essentially be set_git_dir(get_git_dir())
- * which can cause some problems when trying to free the old value of
- * gitdir.
- */
set_git_dir(remove_leading_path(git_dir, work_tree));
initialized = 1;