aboutsummaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-26 11:46:53 -0800
committerJunio C Hamano <gitster@pobox.com>2016-01-27 15:12:37 -0800
commit9d1d2b7fad9bec6320a2058c625787c835864960 (patch)
tree608de8bfb9b2215e463719c1e9296df88a817a7a /git.c
parentac78663b0da0a5b0ad1b87cfe70eecebc0c8a68d (diff)
downloadgit-9d1d2b7fad9bec6320a2058c625787c835864960.tar.gz
git-9d1d2b7fad9bec6320a2058c625787c835864960.tar.xz
git: remove an early return from save_env_before_alias()
When help.autocorrect is in effect, an attempt to auto-execute an uniquely corrected result of a misspelt alias will result in an irrelevant error message. The codepath that causes this calls save_env_before_alias() and restore_env() in handle_alias(), and that happens twice. A global variable orig_cwd is allocated to hold the return value of getcwd() in save_env_before_alias(), which is then used in restore_env() to go back to that directory and finally free(3)'d there. However, save_env_before_alias() is not prepared to be called twice. It returns early when it knows it has already been called, leaving orig_cwd undefined, which is then checked in the second call to restore_env(), and by that time, the memory that used to hold the contents of orig_cwd is either freed or reused to hold something else, and this is fed to chdir(2), causing it to fail. Even if it did not fail (i.e. reading of the already free'd piece of memory yielded a directory path that we can chdir(2) to), it then gets free(3)'d. Fix this by making sure save_env() does do the saving when called. While at it, add a minimal test for help.autocorrect facility. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/git.c b/git.c
index 98d441220..a57a4cb46 100644
--- a/git.c
+++ b/git.c
@@ -30,8 +30,6 @@ static int saved_env_before_alias;
static void save_env_before_alias(void)
{
int i;
- if (saved_env_before_alias)
- return;
saved_env_before_alias = 1;
orig_cwd = xgetcwd();
for (i = 0; i < ARRAY_SIZE(env_names); i++) {