delta-islands: fix segfault when freeing island marks

In 647982bb71 (delta-islands: free island_marks and bitmaps, 2023-02-03)
we have introduced logic to free `island_marks` in order to reduce heap
memory usage in git-pack-objects(1). This commit is causing segfaults in
the case where this Git command does not load delta islands at all, e.g.
when reading object IDs from standard input. One such crash can be hit
when using repacking multi-pack-indices with delta islands enabled.

The root cause of this bug is that we unconditionally dereference the
`island_marks` variable even in the case where it is a `NULL` pointer,
which is fixed by making it conditional. Note that we still leave the
logic in place to set the pointer to `-1` to detect use-after-free bugs
even when there are no loaded island marks at all.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Acked-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/delta-islands.c b/delta-islands.c
index 8b234cb85b03b26b3f7360420e65a8e88c6b2df0..afdec0a878d9368b134342084442317e15007a9c 100644 (file)
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -517,11 +517,13 @@ void free_island_marks(void)
 {
        struct island_bitmap *bitmap;
 
-       kh_foreach_value(island_marks, bitmap, {
-               if (!--bitmap->refcount)
-                       free(bitmap);
-       });
-       kh_destroy_oid_map(island_marks);
+       if (island_marks) {
+               kh_foreach_value(island_marks, bitmap, {
+                       if (!--bitmap->refcount)
+                               free(bitmap);
+               });
+               kh_destroy_oid_map(island_marks);
+       }
 
        /* detect use-after-free with a an address which is never valid: */
        island_marks = (void *)-1;

diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index b5f9b1092229d3d8c1879d41c5c3f02f4ad04923..499d5d4c78590ae16879d8dbd386259d847efb76 100755 (executable)
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -1015,4 +1015,20 @@ test_expect_success 'complains when run outside of a repository' '
        grep "not a git repository" err
 '
 
+test_expect_success 'repack with delta islands' '
+       git init repo &&
+       test_when_finished "rm -fr repo" &&
+       (
+               cd repo &&
+
+               test_commit first &&
+               git repack &&
+               test_commit second &&
+               git repack &&
+
+               git multi-pack-index write &&
+               git -c repack.useDeltaIslands=true multi-pack-index repack
+       )
+'
+
 test_done