diff options
| author | Lukas Fleischer <cgit@cryptocrack.de> | 2013-04-10 12:30:52 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2013-04-10 13:46:30 +0200 |
| commit | 8d8e84e72a24f474a6659ca04d0906723b2ac975 (patch) | |
| tree | 60942d045a435c87284da5a21df7be407e7c7978 | |
| parent | t0107: Use `tar -z` for gzip'ed archives (diff) | |
| download | cgit-pink-8d8e84e72a24f474a6659ca04d0906723b2ac975.tar.gz cgit-pink-8d8e84e72a24f474a6659ca04d0906723b2ac975.zip | |
cgit.c: Do not restore unset environment variables
getenv() returns a NULL pointer if the specified variable name cannot be found in the environment. However, some setenv() implementations crash if a NULL pointer is passed as second argument. Only restore variables that are not NULL. See commit d96d2c98ebc4c2d3765f5b35c4142e0e828a421b for a related patch. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
| -rw-r--r-- | cgit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c index 0bf8972..4dadd97 100644 --- a/cgit.c +++ b/cgit.c @@ -486,8 +486,10 @@ static int prepare_repo_cmd(struct cgit_context *ctx) init_display_notes(NULL); /* We restore the unset variables afterward. */ - setenv("HOME", user_home, 1); - setenv("XDG_CONFIG_HOME", xdg_home, 1); + if (user_home) + setenv("HOME", user_home, 1); + if (xdg_home) + setenv("XDG_CONFIG_HOME", xdg_home, 1); if (nongit) { const char *name = ctx->repo->name; |