From: Michael Haggerty Date: Thu, 26 Apr 2012 22:26:59 +0000 (+0200) Subject: bisect: copy filename string obtained from git_path() X-Git-Tag: v1.7.11-rc0~49^2~9 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=144e7090045a703c8f5d140474f202ba4f38ac9a;p=git.git bisect: copy filename string obtained from git_path() 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 Signed-off-by: Junio C Hamano --- diff --git a/bisect.c b/bisect.c index 6e186e29c..48acf7339 100644 --- a/bisect.c +++ b/bisect.c @@ -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) { - const char *filename = git_path("BISECT_ANCESTORS_OK"); + char *filename = xstrdup(git_path("BISECT_ANCESTORS_OK")); struct stat st; 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. */ if (!stat(filename, &st) && S_ISREG(st.st_mode)) - return; + goto done; /* Bisecting with no good rev is ok. */ if (good_revs.nr == 0) - return; + goto done; /* Check if all good revs are ancestor of the bad rev. */ 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)); else close(fd); + done: + free(filename); } /*