summaryrefslogtreecommitdiff
path: root/line-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-11-26 10:21:58 +0900
committerJunio C Hamano <gitster@pobox.com>2024-11-26 10:21:58 +0900
commitc6c977e82b94a8266a1f24bed6fcddb15bd01d1c (patch)
tree665797668fb1bd2ac1bc0c3a70397d30251f1c01 /line-log.c
parent6ea2d9d271a56afa0e77cd45796ea0592aa9c2d4 (diff)
parentfc1ddf42af6742fae7e770cae20e30d7902014c0 (diff)
Merge branch 'ps/leakfixes-part-10' into ps/bisect-double-free-fix
* ps/leakfixes-part-10: (27 commits) t: remove TEST_PASSES_SANITIZE_LEAK annotations test-lib: unconditionally enable leak checking t: remove unneeded !SANITIZE_LEAK prerequisites t: mark some tests as leak free t5601: work around leak sanitizer issue git-compat-util: drop now-unused `UNLEAK()` macro global: drop `UNLEAK()` annotation t/helper: fix leaking commit graph in "read-graph" subcommand builtin/branch: fix leaking sorting options builtin/init-db: fix leaking directory paths builtin/help: fix leaks in `check_git_cmd()` help: fix leaking return value from `help_unknown_cmd()` help: fix leaking `struct cmdnames` help: refactor to not use globals for reading config builtin/sparse-checkout: fix leaking sanitized patterns split-index: fix memory leak in `move_cache_to_base_index()` git: refactor builtin handling to use a `struct strvec` git: refactor alias handling to use a `struct strvec` strvec: introduce new `strvec_splice()` function line-log: fix leak when rewriting commit parents ...
Diffstat (limited to 'line-log.c')
-rw-r--r--line-log.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/line-log.c b/line-log.c
index bca9bd8040..bc67b75d10 100644
--- a/line-log.c
+++ b/line-log.c
@@ -1237,6 +1237,7 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm
* don't follow any other path in history
*/
add_line_range(rev, parents[i], cand[i]);
+ free_commit_list(commit->parents);
commit_list_append(parents[i], &commit->parents);
ret = 0;