object: fix leaking packfiles when closing object store

When calling `raw_object_store_clear()`, we close and free several
resources associated with the object store. Part of that is to close and
free all the packfiles, which is handled by `close_object_store()`.

That function really only ends up closing the packfiles though, but it
doesn't free them. And in fact it can't, as that function is being
called via `run_command()` when `close_object_store = 1`, which is done
e.g. when we execute git-maintenance(1). At that point, other structures
may still have references on those packfiles, and thus we cannot free
them here. So while it is in fact intentional that we really only close
them, the result is a memory leak because `raw_object_store_clear()`
does not free them, either.

Fix the leak by freeing the packfiles in `raw_object_store_clear()`.

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

diff --git a/object.c b/object.c
index 0c0fcb76c0c80a874d70f66bbfdbddbf6ce19d19..d756c7f2ea34f31f68e2cab93d9b53da87a42ea3 100644 (file)
--- a/object.c
+++ b/object.c
@@ -614,6 +614,15 @@ void raw_object_store_clear(struct raw_object_store *o)
 
        INIT_LIST_HEAD(&o->packed_git_mru);
        close_object_store(o);
+
+       /*
+        * `close_object_store()` only closes the packfiles, but doesn't free
+        * them. We thus have to do this manually.
+        */
+       for (struct packed_git *p = o->packed_git, *next; p; p = next) {
+               next = p->next;
+               free(p);
+       }
        o->packed_git = NULL;
 
        hashmap_clear(&o->pack_map);

diff --git a/t/t7424-submodule-mixed-ref-formats.sh b/t/t7424-submodule-mixed-ref-formats.sh
index 559713b60773a41373c4cb14114d6c9d50624616..b43ef2ba675b8d340ceed10ea12862817aeb1120 100755 (executable)
--- a/t/t7424-submodule-mixed-ref-formats.sh
+++ b/t/t7424-submodule-mixed-ref-formats.sh
@@ -2,6 +2,7 @@
 
 test_description='submodules handle mixed ref storage formats'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_ref_format () {