summaryrefslogtreecommitdiff
path: root/midx.c
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2021-08-31 20:52:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-01 17:58:43 (GMT)
commit9bb6c2e54f88e92ba8715f2412e57c57793721e0 (patch)
tree16795dad941f2d736c15ab263dacac7c1a333e67 /midx.c
parent177c0d6e63d7f9c707dbe2df1124dd27002d1e91 (diff)
downloadgit-9bb6c2e54f88e92ba8715f2412e57c57793721e0.zip
git-9bb6c2e54f88e92ba8715f2412e57c57793721e0.tar.gz
git-9bb6c2e54f88e92ba8715f2412e57c57793721e0.tar.bz2
midx: close linked MIDXs, avoid leaking memory
When a repository has at least one alternate, the MIDX belonging to each alternate is accessed through the `next` pointer on the main object store's copy of the MIDX. close_midx() didn't bother to close any of the linked MIDXs. It likewise didn't free the memory pointed to by `m`, leaving uninitialized bytes with live pointers to them left around in the heap. Clean this up by closing linked MIDXs, and freeing up the memory pointed to by each of them. When callers call close_midx(), then they can discard the entire linked list of MIDXs and set their pointer to the head of that list to NULL. This isn't strictly required for the upcoming patches, but it makes it much more difficult (though still possible, for e.g., by calling `close_midx(m->next)` which leaves `m->next` pointing at uninitialized bytes) to have pointers to uninitialized memory. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'midx.c')
-rw-r--r--midx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/midx.c b/midx.c
index 67de1db..e83f22b 100644
--- a/midx.c
+++ b/midx.c
@@ -195,6 +195,8 @@ void close_midx(struct multi_pack_index *m)
if (!m)
return;
+ close_midx(m->next);
+
munmap((unsigned char *)m->data, m->data_len);
for (i = 0; i < m->num_packs; i++) {
@@ -203,6 +205,7 @@ void close_midx(struct multi_pack_index *m)
}
FREE_AND_NULL(m->packs);
FREE_AND_NULL(m->pack_names);
+ free(m);
}
int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id)