diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-03-04 18:32:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-04 21:24:18 (GMT) |
| commit | 4a0479086a9bea5d31c4588b07bd45ae92a12b71 (patch) | |
| tree | eb7ac9339c612692ca0edc1a183fc5dd176013bd /commit-graph.c | |
| parent | 8f79015111f879451ceff83bbb9b4a29ebbbeb1d (diff) | |
| download | git-4a0479086a9bea5d31c4588b07bd45ae92a12b71.zip git-4a0479086a9bea5d31c4588b07bd45ae92a12b71.tar.gz git-4a0479086a9bea5d31c4588b07bd45ae92a12b71.tar.bz2 | |
commit-graph: fix memory leak in misused string_list API
When this code was migrated to the string_list API in
d88b14b3fd6 (commit-graph: use string-list API for input, 2018-06-27)
it was made to use used both STRING_LIST_INIT_NODUP and a
strbuf_detach() pattern.
Those should not be used together if string_list_clear() is expected
to free the memory, instead we need to either use STRING_LIST_INIT_DUP
with a string_list_append_nodup(), or a STRING_LIST_INIT_NODUP and
manually fiddle with the "strdup_strings" member before calling
string_list_clear(). Let's do the former.
Since "strdup_strings = 1" is set now other code might be broken by
relying on "pack_indexes" not to duplicate it strings, but that
doesn't happen. When we pass this down to write_commit_graph() that
code uses the "struct string_list" without modifying it. Let's add a
"const" to the variable to have the compiler enforce that assumption.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/commit-graph.c b/commit-graph.c index 265c010..d0c9460 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1679,7 +1679,7 @@ int write_commit_graph_reachable(struct object_directory *odb, } static int fill_oids_from_packs(struct write_commit_graph_context *ctx, - struct string_list *pack_indexes) + const struct string_list *pack_indexes) { uint32_t i; struct strbuf progress_title = STRBUF_INIT; @@ -2259,7 +2259,7 @@ out: } int write_commit_graph(struct object_directory *odb, - struct string_list *pack_indexes, + const struct string_list *const pack_indexes, struct oidset *commits, enum commit_graph_write_flags flags, const struct commit_graph_opts *opts) |