Skip to content

Commit 8c05e42

Browse files
ahuntgitster
authored andcommitted
builtin/merge: free found_ref when done
merge_name() calls dwim_ref(), which allocates a new string into found_ref. Therefore add a free() to avoid leaking found_ref. LSAN output from t0021: 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 0xa8beb8 in xstrdup wrapper.c:29:14 #2 0x954054 in expand_ref refs.c:671:12 #3 0x953cb6 in repo_dwim_ref refs.c:644:22 #4 0x5d3759 in dwim_ref refs.h:162:9 #5 0x5d3759 in merge_name builtin/merge.c:517:6 #6 0x5d3759 in collect_parents builtin/merge.c:1214:5 #7 0x5cf60d in cmd_merge builtin/merge.c:1458:16 #8 0x4ce83e in run_builtin git.c:475:11 #9 0x4ccafe in handle_builtin git.c:729:3 #10 0x4cb01c in run_argv git.c:818:4 #11 0x4cb01c in cmd_main git.c:949:19 #12 0x6bdbfd in main common-main.c:52:11 #13 0x7f0430502349 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 ed3c566 commit 8c05e42

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

builtin/merge.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
503503
struct strbuf bname = STRBUF_INIT;
504504
struct merge_remote_desc *desc;
505505
const char *ptr;
506-
char *found_ref;
506+
char *found_ref = NULL;
507507
int len, early;
508508

509509
strbuf_branchname(&bname, remote, 0);
@@ -586,6 +586,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
586586
strbuf_addf(msg, "%s\t\tcommit '%s'\n",
587587
oid_to_hex(&remote_head->object.oid), remote);
588588
cleanup:
589+
free(found_ref);
589590
strbuf_release(&buf);
590591
strbuf_release(&bname);
591592
}

0 commit comments

Comments
 (0)