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

Merge branch 'ma/ref-filter-leakfix'

Browse Source 
Leakfix.

* ma/ref-filter-leakfix:
  ref-filter: fix memory leak in `free_array_item()`
This commit is contained in:
Junio C Hamano
2019-07-19 11:30:23 -07:00
parent fff813c6ae 14d30cdfc0
commit 8619522ad1
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ref-filter.c
View File

@ -2142,7 +2142,9 @@ static void free_array_item(struct ref_array_item *item)
{ {
free((char *)item->symref); free((char *)item->symref);
if (item->value) { if (item->value) {
free((char *)item->value->s); int i;
for (i = 0; i < used_atom_cnt; i++)
free((char *)item->value[i].s);
free(item->value); free(item->value);
} }
free(item); free(item);
@ -2153,14 +2155,16 @@ void ref_array_clear(struct ref_array *array)
{ {
int i; int i;
for (i = 0; i < used_atom_cnt; i++)
free((char *)used_atom[i].name);
FREE_AND_NULL(used_atom);
used_atom_cnt = 0;
for (i = 0; i < array->nr; i++) for (i = 0; i < array->nr; i++)
free_array_item(array->items[i]); free_array_item(array->items[i]);
FREE_AND_NULL(array->items); FREE_AND_NULL(array->items);
array->nr = array->alloc = 0; array->nr = array->alloc = 0;
for (i = 0; i < used_atom_cnt; i++)
free((char *)used_atom[i].name);
FREE_AND_NULL(used_atom);
used_atom_cnt = 0;
if (ref_to_worktree_map.worktrees) { if (ref_to_worktree_map.worktrees) {
hashmap_free(&(ref_to_worktree_map.map), 1); hashmap_free(&(ref_to_worktree_map.map), 1);
free_worktrees(ref_to_worktree_map.worktrees); free_worktrees(ref_to_worktree_map.worktrees);