merge-recursive: fix leaking rename conflict info

When computing rename conflicts in our recursive merge algorithm we set
up `struct rename_conflict_info`s to track that information. We never
free those data structures though and thus leak memory.

We need to be a bit more careful here though because the same rename
conflict info can be assigned to multiple structures. Accommodate for
this by introducing a `rename_conflict_info_owned` bit that we can use
to steer whether or not the rename conflict info shall be free'd.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-recursive.c b/merge-recursive.c
index 8ff29ed09efb3303adf82d39c5fb54a0d11fc897..8c8e8b4868b7b11e67d8250e380c62f55b2f8a80 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -239,7 +239,8 @@ enum rename_type {
 struct stage_data {
        struct diff_filespec stages[4]; /* mostly for oid & mode; maybe path */
        struct rename_conflict_info *rename_conflict_info;
-       unsigned processed:1;
+       unsigned processed:1,
+                rename_conflict_info_owned:1;
 };
 
 struct rename {
@@ -308,6 +309,7 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
 
        ci->ren1->dst_entry->processed = 0;
        ci->ren1->dst_entry->rename_conflict_info = ci;
+       ci->ren1->dst_entry->rename_conflict_info_owned = 1;
        if (ren2) {
                ci->ren2->dst_entry->rename_conflict_info = ci;
        }
@@ -3055,6 +3057,10 @@ static void final_cleanup_rename(struct string_list *rename)
        for (i = 0; i < rename->nr; i++) {
                re = rename->items[i].util;
                diff_free_filepair(re->pair);
+               if (re->src_entry->rename_conflict_info_owned)
+                       FREE_AND_NULL(re->src_entry->rename_conflict_info);
+               if (re->dst_entry->rename_conflict_info_owned)
+                       FREE_AND_NULL(re->dst_entry->rename_conflict_info);
        }
        string_list_clear(rename, 1);
        free(rename);

diff --git a/t/t3401-rebase-and-am-rename.sh b/t/t3401-rebase-and-am-rename.sh
index f18bae94507587a4dc9118cc3d508902e02c6bc1..328c1d3a3f45bcf2a2c153c94556d0b56fb5bbce 100755 (executable)
--- a/t/t3401-rebase-and-am-rename.sh
+++ b/t/t3401-rebase-and-am-rename.sh
@@ -2,6 +2,7 @@
 
 test_description='git rebase + directory rename tests'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
 

diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh
index 4add7c775782ff9c3f20a372fa2a076c4651b85b..6bc377b917f2ef1465f8efa48a42eb4aea60dff0 100755 (executable)
--- a/t/t4153-am-resume-override-opts.sh
+++ b/t/t4153-am-resume-override-opts.sh
@@ -2,6 +2,7 @@
 
 test_description='git-am command-line options override saved options'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 42352dc0dbe51ec6ccf9eccc32df6932fdf711e9..189d8e341babf2e80527d9b10da63f8a7deb9b43 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -23,6 +23,7 @@ Test switching across them.
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_tick