undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect: copy filename string obtained from git_path()

Browse Source 
Prevent the string from being overwritten by other callers of
git_path() and friends before we are done using it.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2012-04-27 00:26:59 +02:00 committed by Junio C Hamano
parent 989c0e5d02
commit 144e709004
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bisect.c
View File

@ -833,7 +833,7 @@ static int check_ancestors(const char *prefix)
*/ */
static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout) static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
{ {
const char *filename = git_path("BISECT_ANCESTORS_OK"); char *filename = xstrdup(git_path("BISECT_ANCESTORS_OK"));
struct stat st; struct stat st;
int fd; int fd;
@ -842,11 +842,11 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
/* Check if file BISECT_ANCESTORS_OK exists. */ /* Check if file BISECT_ANCESTORS_OK exists. */
if (!stat(filename, &st) && S_ISREG(st.st_mode)) if (!stat(filename, &st) && S_ISREG(st.st_mode))
return; goto done;
/* Bisecting with no good rev is ok. */ /* Bisecting with no good rev is ok. */
if (good_revs.nr == 0) if (good_revs.nr == 0)
return; goto done;
/* Check if all good revs are ancestor of the bad rev. */ /* Check if all good revs are ancestor of the bad rev. */
if (check_ancestors(prefix)) if (check_ancestors(prefix))
@ -859,6 +859,8 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
filename, strerror(errno)); filename, strerror(errno));
else else
close(fd); close(fd);
done:
free(filename);
} }
/* /*