revisions API: release "reflog_info" in release revisions()

Add a missing reflog_walk_info_release() to "reflog-walk.c" and use it
in release_revisions().

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/reflog-walk.c b/reflog-walk.c
index 8ac4b284b6b6857a0a6d1f79eed563135771a291..7aa6595a51f757ec2d25ed5d96c805ff1dbf13d2 100644 (file)
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -8,7 +8,7 @@
 
 struct complete_reflogs {
        char *ref;
-       const char *short_ref;
+       char *short_ref;
        struct reflog_info {
                struct object_id ooid, noid;
                char *email;
@@ -51,9 +51,16 @@ static void free_complete_reflog(struct complete_reflogs *array)
        }
        free(array->items);
        free(array->ref);
+       free(array->short_ref);
        free(array);
 }
 
+static void complete_reflogs_clear(void *util, const char *str)
+{
+       struct complete_reflogs *array = util;
+       free_complete_reflog(array);
+}
+
 static struct complete_reflogs *read_complete_reflog(const char *ref)
 {
        struct complete_reflogs *reflogs =
@@ -116,6 +123,21 @@ void init_reflog_walk(struct reflog_walk_info **info)
        (*info)->complete_reflogs.strdup_strings = 1;
 }
 
+void reflog_walk_info_release(struct reflog_walk_info *info)
+{
+       size_t i;
+
+       if (!info)
+               return;
+
+       for (i = 0; i < info->nr; i++)
+               free(info->logs[i]);
+       string_list_clear_func(&info->complete_reflogs,
+                              complete_reflogs_clear);
+       free(info->logs);
+       free(info);
+}
+
 int add_reflog_for_walk(struct reflog_walk_info *info,
                struct commit *commit, const char *name)
 {

diff --git a/reflog-walk.h b/reflog-walk.h
index e9e00ffd479475a6a887b04ae685a64d3b251db7..8076f10d9fbc0dd5588582f5bfec105416037233 100644 (file)
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -8,6 +8,7 @@ struct reflog_walk_info;
 struct date_mode;
 
 void init_reflog_walk(struct reflog_walk_info **info);
+void reflog_walk_info_release(struct reflog_walk_info *info);
 int add_reflog_for_walk(struct reflog_walk_info *info,
                        struct commit *commit, const char *name);
 void show_reflog_message(struct reflog_walk_info *info, int,

diff --git a/revision.c b/revision.c
index 5aa6dec4532360498424325dbcb4ae58a63bce37..8cd849aa2b949d084e16a8ecdc90d46bbec7fdc4 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -2953,6 +2953,7 @@ void release_revisions(struct rev_info *revs)
        clear_pathspec(&revs->prune_data);
        release_revisions_mailmap(revs->mailmap);
        free_grep_patterns(&revs->grep_filter);
+       reflog_walk_info_release(revs->reflog_info);
 }
 
 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)

diff --git a/t/t0100-previous.sh b/t/t0100-previous.sh
index 69beb59f627faab6b9bd7c197a3335a88d12e368..a16cc3d298357be89e58514db83c1d3f04b3ad4d 100755 (executable)
--- a/t/t0100-previous.sh
+++ b/t/t0100-previous.sh
@@ -5,6 +5,7 @@ test_description='previous branch syntax @{-n}'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'branch -d @{-1}' '

diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh
index 132a1b885acbce46cb9f8a1b52fc2833fc8a7990..9fb0b90f252aa17a04a52678eb48a3a9bf9883ee 100755 (executable)
--- a/t/t1401-symbolic-ref.sh
+++ b/t/t1401-symbolic-ref.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='basic symbolic-ref tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # If the tests munging HEAD fail, they can break detection of

diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 0bb319b944a0f1bd02bf88a9efda1b02f929511c..3770ceffafd25f2771b162ea7f5c5a3d020c6722 100755 (executable)
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -4,6 +4,7 @@ test_description='Test reflog display routines'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '

diff --git a/t/t1412-reflog-loop.sh b/t/t1412-reflog-loop.sh
index 977603f7f1ca9efb781c5743f1e730246e6d1963..ff30874f940439fe979e3857400c54b944194dcb 100755 (executable)
--- a/t/t1412-reflog-loop.sh
+++ b/t/t1412-reflog-loop.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='reflog walk shows repeated commits again'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup commits' '

diff --git a/t/t1415-worktree-refs.sh b/t/t1415-worktree-refs.sh
index a3e6ea08088b15ee461c53e2baebe7d0dfb19664..3b531842dd4c864b45bfd89c36e14f9327d6b29e 100755 (executable)
--- a/t/t1415-worktree-refs.sh
+++ b/t/t1415-worktree-refs.sh
@@ -2,6 +2,7 @@
 
 test_description='per-worktree refs'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '