mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect: fix leaking good/bad terms when reading multipe times

Browse Source 
Even though `read_bisect_terms()` is declared as assigning string
constants, it in fact assigns allocated strings to the `read_bad` and
`read_good` out parameters. The only callers of this function assign the
result to global variables and thus don't have to free them in order to
be leak-free. But that changes when executing the function multiple
times because we'd then overwrite the previous value and thus make it
unreachable.

Fix the function signature and free the previous values. This leak is
exposed by t0630, but plugging it does not make the whole test suite
pass.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-11-20 14:39:31 +01:00
committed by Junio C Hamano
parent 65a1b7e2bd
commit 79366add74
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bisect.c
View File

@ -28,8 +28,8 @@ static struct oid_array skipped_revs;
static struct object_id *current_bad_oid;
static const char *term_bad;
static const char *term_good;
static char *term_bad;
static char *term_good;
/* Remember to update object flag allocation in object.h */
#define COUNTED (1u<<16)
@ -985,7 +985,7 @@ static void show_commit(struct commit *commit)
* We read them and store them to adapt the messages accordingly.
* Default is bad/good.
*/
void read_bisect_terms(const char **read_bad, const char **read_good)
void read_bisect_terms(char **read_bad, char **read_good)
{
struct strbuf str = STRBUF_INIT;
const char *filename = git_path_bisect_terms();
@ -993,16 +993,20 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
if (!fp) {
if (errno == ENOENT) {
*read_bad = "bad";
*read_good = "good";
free(*read_bad);
*read_bad = xstrdup("bad");
free(*read_good);
*read_good = xstrdup("good");
return;
} else {
die_errno(_("could not read file '%s'"), filename);
}
} else {
strbuf_getline_lf(&str, fp);
free(*read_bad);
*read_bad = strbuf_detach(&str, NULL);
strbuf_getline_lf(&str, fp);
free(*read_good);
*read_good = strbuf_detach(&str, NULL);
}
strbuf_release(&str);