aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Keeping2022-02-13 15:34:50 +0000
committerJason A. Donenfeld2022-12-19 16:13:58 +0100
commit4c520cefc90b10566fcc8a0b006287494a7770e1 (patch)
tree92552dae5b62a8aba4e6ad4002716ec189dd3036
parentd071f28cfa9a49f3aa6355b17e9d9fa7224ff49f (diff)
downloadcgit-4c520cefc90b10566fcc8a0b006287494a7770e1.tar
cgit-4c520cefc90b10566fcc8a0b006287494a7770e1.tar.gz
cgit-4c520cefc90b10566fcc8a0b006287494a7770e1.zip
global: use release_commit_memory()
Instead of calling two separate Git functions to free memory associated with a commit object, use Git's wrapper which does this. This also counts as a potential future bug fix since release_commit_memory() also resets the parsed state of the commit, meaning any attempt to use it in the future will correctly fill out the fields again. release_commit_memory() does not set parents to zero, so keep that for additional safety in case CGit checks this without calling parse_commit() again. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--ui-atom.c3
-rw-r--r--ui-log.c6
-rw-r--r--ui-stats.c3
3 files changed, 4 insertions, 8 deletions
diff --git a/ui-atom.c b/ui-atom.c
index 541660d..5f4ad7d 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -149,8 +149,7 @@ void cgit_print_atom(char *tip, const char *path, int max_count)
first = false;
}
add_entry(commit, host);
- free_commit_buffer(the_repository->parsed_objects, commit);
- free_commit_list(commit->parents);
+ release_commit_memory(the_repository->parsed_objects, commit);
commit->parents = NULL;
}
html("</feed>\n");
diff --git a/ui-log.c b/ui-log.c
index 565929f..311304a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -489,8 +489,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) {
if (show_commit(commit, &rev))
i++;
- free_commit_buffer(the_repository->parsed_objects, commit);
- free_commit_list(commit->parents);
+ release_commit_memory(the_repository->parsed_objects, commit);
commit->parents = NULL;
}
@@ -511,8 +510,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
i++;
print_commit(commit, &rev);
}
- free_commit_buffer(the_repository->parsed_objects, commit);
- free_commit_list(commit->parents);
+ release_commit_memory(the_repository->parsed_objects, commit);
commit->parents = NULL;
}
if (pager) {
diff --git a/ui-stats.c b/ui-stats.c
index 09b3625..40ed6c2 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -241,8 +241,7 @@ static struct string_list collect_stats(const struct cgit_period *period)
memset(&authors, 0, sizeof(authors));
while ((commit = get_revision(&rev)) != NULL) {
add_commit(&authors, commit, period);
- free_commit_buffer(the_repository->parsed_objects, commit);
- free_commit_list(commit->parents);
+ release_commit_memory(the_repository->parsed_objects, commit);
commit->parents = NULL;
}
return authors;