mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-objects: free packing_data in more places

Browse Source 
The pack-objects internals use a packing_data struct to track what
objects are part of the pack(s) being formed.

Since these structures contain allocated fields, failing to
appropriately free() them results in a leak. Plug that leak by
introducing a clear_packing_data() function, and call it in the
appropriate spots.

This is a fairly straightforward leak to plug, since none of the callers
expect to read any values or have any references to parts of the address
space being freed.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau 2023-12-14 17:23:39 -05:00 committed by Junio C Hamano
parent 1a87c842ec
commit 66f0c71073
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/pack-objects.c
View File

@ -4522,6 +4522,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
reuse_packfile_objects); reuse_packfile_objects);
cleanup: cleanup:
clear_packing_data(&to_pack);
list_objects_filter_release(&filter_options); list_objects_filter_release(&filter_options);
strvec_clear(&rp); strvec_clear(&rp);

5
midx.c
View File

@ -1603,8 +1603,13 @@ static int write_midx_internal(const char *object_dir,
flags) < 0) { flags) < 0) {
error(_("could not write multi-pack bitmap")); error(_("could not write multi-pack bitmap"));
result = 1; result = 1;
clear_packing_data(&pdata);
free(commits);
goto cleanup; goto cleanup;
} }
clear_packing_data(&pdata);
free(commits);
} }
/* /*
* NOTE: Do not use ctx.entries beyond this point, since it might * NOTE: Do not use ctx.entries beyond this point, since it might

15
pack-objects.c
View File

@ -151,6 +151,21 @@ void prepare_packing_data(struct repository *r, struct packing_data *pdata)
init_recursive_mutex(&pdata->odb_lock); init_recursive_mutex(&pdata->odb_lock);
} }
void clear_packing_data(struct packing_data *pdata)
{
if (!pdata)
return;
free(pdata->cruft_mtime);
free(pdata->in_pack);
free(pdata->in_pack_by_idx);
free(pdata->in_pack_pos);
free(pdata->index);
free(pdata->layer);
free(pdata->objects);
free(pdata->tree_depth);
}
struct object_entry *packlist_alloc(struct packing_data *pdata, struct object_entry *packlist_alloc(struct packing_data *pdata,
const struct object_id *oid) const struct object_id *oid)
{ {

1
pack-objects.h
View File

@ -169,6 +169,7 @@ struct packing_data {
}; };
void prepare_packing_data(struct repository *r, struct packing_data *pdata); void prepare_packing_data(struct repository *r, struct packing_data *pdata);
void clear_packing_data(struct packing_data *pdata);
/* Protect access to object database */ /* Protect access to object database */
static inline void packing_data_lock(struct packing_data *pdata) static inline void packing_data_lock(struct packing_data *pdata)