@matheusbsbs / matheus-bagliano / commits / f4f51add27
Fork 0

setup_git_directory: fix segfault if repository is found in cwd

Additionally there was a similar part calling setenv and getenv in the same way which missed a check if getenv succeeded. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Matthias Lederhofer committed Jun 6, 2007 at 23:29 UTC f4f51add2712293b7bc9e7aaebf6a589bb37c7c7
1 file changed +5
setup.c
+5
@@ -251,6 +251,9 @@ const char *setup_git_directory_gently(int *nongit_ok)
251 die("Not a git repository");
252 }
253 setenv(GIT_DIR_ENVIRONMENT, cwd, 1);
254 + gitdirenv = getenv(GIT_DIR_ENVIRONMENT);
255 + if (!gitdirenv)
256 + die("getenv after setenv failed");
257 }
258
259 if (PATH_MAX - 40 < strlen(gitdirenv)) {
@@ -290,6 +293,8 @@ const char *setup_git_directory_gently(int *nongit_ok)
293 if (gitdirenv[0] != '/') {
294 setenv(GIT_DIR_ENVIRONMENT, gitdir, 1);
295 gitdirenv = getenv(GIT_DIR_ENVIRONMENT);
296 + if (!gitdirenv)
297 + die("getenv after setenv failed");
298 if (PATH_MAX - 40 < strlen(gitdirenv)) {
299 if (nongit_ok) {
300 *nongit_ok = 1;