about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJohn Keeping2022-02-13 15:34:50 +0000
committerJune McEnroe2022-02-18 00:16:05 +0000
commit400fd7abbc9cf104999afeb05a7a40b8d58814b2 (patch)
treecd22901af7bc9cdc634543b1f13da840ae21f146
parentReset font size for blame oid (diff)
downloadcgit-400fd7abbc9cf104999afeb05a7a40b8d58814b2.tar.gz
cgit-400fd7abbc9cf104999afeb05a7a40b8d58814b2.zip
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>
-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 8329e01..0cf8441 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)
149 first = 0; 149 first = 0;
150 } 150 }
151 add_entry(commit, host); 151 add_entry(commit, host);
152 free_commit_buffer(the_repository->parsed_objects, commit); 152 release_commit_memory(the_repository->parsed_objects, commit);
153 free_commit_list(commit->parents);
154 commit->parents = NULL; 153 commit->parents = NULL;
155 } 154 }
156 html("</feed>\n"); 155 html("</feed>\n");
diff --git a/ui-log.c b/ui-log.c index b443ca7..82476e0 100644 --- a/ui-log.c +++ b/ui-log.c
@@ -493,8 +493,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
493 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) { 493 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) {
494 if (show_commit(commit, &rev)) 494 if (show_commit(commit, &rev))
495 i++; 495 i++;
496 free_commit_buffer(the_repository->parsed_objects, commit); 496 release_commit_memory(the_repository->parsed_objects, commit);
497 free_commit_list(commit->parents);
498 commit->parents = NULL; 497 commit->parents = NULL;
499 } 498 }
500 499
@@ -515,8 +514,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
515 i++; 514 i++;
516 print_commit(commit, &rev); 515 print_commit(commit, &rev);
517 } 516 }
518 free_commit_buffer(the_repository->parsed_objects, commit); 517 release_commit_memory(the_repository->parsed_objects, commit);
519 free_commit_list(commit->parents);
520 commit->parents = NULL; 518 commit->parents = NULL;
521 } 519 }
522 if (pager) { 520 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)
241 memset(&authors, 0, sizeof(authors)); 241 memset(&authors, 0, sizeof(authors));
242 while ((commit = get_revision(&rev)) != NULL) { 242 while ((commit = get_revision(&rev)) != NULL) {
243 add_commit(&authors, commit, period); 243 add_commit(&authors, commit, period);
244 free_commit_buffer(the_repository->parsed_objects, commit); 244 release_commit_memory(the_repository->parsed_objects, commit);
245 free_commit_list(commit->parents);
246 commit->parents = NULL; 245 commit->parents = NULL;
247 } 246 }
248 return authors; 247 return authors;