Skip to content

Commit d7cf418

Browse files
ahuntgitster
authored andcommitted
ref-filter: also free head for ATOM_HEAD to avoid leak
u.head is populated using resolve_refdup(), which returns a newly allocated string - hence we also need to free() it. Found while running t0041 with LSAN: Direct leak of 16 byte(s) in 1 object(s) allocated from: #0 0x486804 in strdup ../projects/compiler-rt/lib/asan/asan_interceptors.cpp:452:3 #1 0xa8be98 in xstrdup wrapper.c:29:14 #2 0x9481db in head_atom_parser ref-filter.c:549:17 #3 0x9408c7 in parse_ref_filter_atom ref-filter.c:703:30 #4 0x9400e3 in verify_ref_format ref-filter.c:974:8 #5 0x4f9e8b in print_ref_list builtin/branch.c:439:6 #6 0x4f9e8b in cmd_branch builtin/branch.c:757:3 #7 0x4ce83e in run_builtin git.c:475:11 #8 0x4ccafe in handle_builtin git.c:729:3 #9 0x4cb01c in run_argv git.c:818:4 #10 0x4cb01c in cmd_main git.c:949:19 #11 0x6bdc2d in main common-main.c:52:11 #12 0x7f96edf86349 in __libc_start_main (/lib64/libc.so.6+0x24349) SUMMARY: AddressSanitizer: 16 byte(s) leaked in 1 allocation(s). Signed-off-by: Andrzej Hunt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4e3250b commit d7cf418

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

ref-filter.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2225,8 +2225,12 @@ void ref_array_clear(struct ref_array *array)
22252225
FREE_AND_NULL(array->items);
22262226
array->nr = array->alloc = 0;
22272227

2228-
for (i = 0; i < used_atom_cnt; i++)
2229-
free((char *)used_atom[i].name);
2228+
for (i = 0; i < used_atom_cnt; i++) {
2229+
struct used_atom *atom = &used_atom[i];
2230+
if (atom->atom_type == ATOM_HEAD)
2231+
free(atom->u.head);
2232+
free((char *)atom->name);
2233+
}
22302234
FREE_AND_NULL(used_atom);
22312235
used_atom_cnt = 0;
22322236

0 commit comments

Comments
 (0)