fix some memleaksmerge

5 files changed, 45 insertions, 50 deletions

diff --git a/src/merge.c b/src/merge.c
index 35b6f2c29..5d004f66d 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -511,7 +511,7 @@ static char *merge_filediff_entry_name(const git_merge_head *merge_head,
 		git_buf_puts(&name, entry->file.path);
 	}
 	
-	return strdup(name.ptr);
+	return name.ptr;
 }
 
 static int merge_filediff_entry_names(char **our_path,
@@ -521,6 +521,9 @@ static int merge_filediff_entry_names(char **our_path,
 {
 	bool rename;
 
+	*our_path = NULL;
+	*their_path = NULL;
+
 	if (!merge_heads)
 		return 0;
 
@@ -528,9 +531,15 @@ static int merge_filediff_entry_names(char **our_path,
 	 * If all the paths are identical, decorate the diff3 file with the branch
 	 * names.  Otherwise, use branch_name:path
 	 */
-	rename = strcmp(delta->ours.file.path, delta->theirs.file.path) != 0;
-	
-	if ((*our_path = merge_filediff_entry_name(merge_heads[1], &delta->ours, rename)) == NULL ||
+	rename = GIT_DIFF_TREE_FILE_EXISTS(delta->ours) &&
+		GIT_DIFF_TREE_FILE_EXISTS(delta->theirs) &&
+		strcmp(delta->ours.file.path, delta->theirs.file.path) != 0;
+
+	if (GIT_DIFF_TREE_FILE_EXISTS(delta->ours) &&
+		(*our_path = merge_filediff_entry_name(merge_heads[1], &delta->ours, rename)) == NULL)
+		return -1;
+
+	if (GIT_DIFF_TREE_FILE_EXISTS(delta->theirs) &&
 		(*their_path = merge_filediff_entry_name(merge_heads[2], &delta->theirs, rename)) == NULL)
 		return -1;
 
@@ -623,11 +632,8 @@ static int merge_filediff(
 	result->len = mmbuffer.size;
 	
 done:
-	if (our_name)
-		git__free(our_name);
-
-	if (their_name)
-		git__free(their_name);
+	git__free(our_name);
+	git__free(their_name);
 
 	git_odb_object_free(ancestor_odb);
 	git_odb_object_free(our_odb);
@@ -1257,7 +1263,7 @@ static int merge_ancestor_head(
 	if ((error = git_merge_base_many(&ancestor_oid, repo, oids, their_heads_len + 1)) < 0)
 		goto on_error;
 
-	return git_merge_head_from_oid(ancestor_head, repo, &ancestor_oid);
+	error = git_merge_head_from_oid(ancestor_head, repo, &ancestor_oid);
 
 on_error:
 	git__free(oids);
diff --git a/tests-clar/merge/fastforward.c b/tests-clar/merge/fastforward.c
index 71cc815d0..b650695a2 100644
--- a/tests-clar/merge/fastforward.c
+++ b/tests-clar/merge/fastforward.c
@@ -41,6 +41,9 @@ static git_merge_result *merge_fastforward_branch(int flags)
 
 	cl_git_pass(git_merge(&result, repo, (const git_merge_head **)their_heads, 1, &opts));
 
+	git_merge_head_free(their_heads[0]);
+	git_reference_free(their_ref);
+
 	return result;
 }
 
@@ -79,7 +82,7 @@ void test_merge_fastforward__no_fastforward(void)
 
     cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
-    
+
 	git_merge_result_free(result);
 }
 
@@ -96,5 +99,6 @@ void test_merge_fastforward__uptodate(void)
 
 	cl_assert(git_merge_result_is_uptodate(result));
 
+	git_merge_head_free(their_heads[0]);
 	git_merge_result_free(result);
 }
diff --git a/tests-clar/merge/simple.c b/tests-clar/merge/simple.c
index 974c37c54..37880be4f 100644
--- a/tests-clar/merge/simple.c
+++ b/tests-clar/merge/simple.c
@@ -98,6 +98,8 @@ static git_merge_result *merge_simple_branch(int resolve_flags, int conflict_fla
 	opts.merge_trees_opts.resolve_flags = resolve_flags;
 	opts.conflict_flags = conflict_flags;
 	cl_git_pass(git_merge(&result, repo, (const git_merge_head **)their_heads, 1, &opts));
+
+	git_merge_head_free(their_heads[0]);
     
 	return result;
 }
diff --git a/tests-clar/merge/trivial.c b/tests-clar/merge/trivial.c
index 7087ab3e6..9e52bacf9 100644
--- a/tests-clar/merge/trivial.c
+++ b/tests-clar/merge/trivial.c
@@ -27,7 +27,7 @@ void test_merge_trivial__cleanup(void)
 }
 
 
-static git_merge_result *merge_trivial(const char *ours, const char *theirs, bool automerge)
+static int *merge_trivial(const char *ours, const char *theirs, bool automerge)
 {
 	git_buf branch_buf = GIT_BUF_INIT;
 	git_checkout_opts checkout_opts = GIT_CHECKOUT_OPTS_INIT;
@@ -57,8 +57,9 @@ static git_merge_result *merge_trivial(const char *ours, const char *theirs, boo
 	git_reference_free(our_ref);
 	git_reference_free(their_ref);
 	git_merge_head_free(their_heads[0]);
+	git_merge_result_free(result);
 
-	return result;
+	return 0;
 }
 
 static int merge_trivial_conflict_entrycount(void)
@@ -80,10 +81,9 @@ static int merge_trivial_conflict_entrycount(void)
 /* 2ALT: ancest:(empty)+, head:*empty*, remote:remote = result:remote */
 void test_merge_trivial__2alt(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-2alt", "trivial-2alt-branch", 0));
+	cl_git_pass(merge_trivial("trivial-2alt", "trivial-2alt-branch", 0));
 
 	cl_assert(entry = git_index_get_bypath(repo_index, "new-in-branch.txt", 0));
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -93,10 +93,9 @@ void test_merge_trivial__2alt(void)
 /* 3ALT: ancest:(empty)+, head:head, remote:*empty* = result:head */
 void test_merge_trivial__3alt(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-3alt", "trivial-3alt-branch", 0));
+	cl_git_pass(merge_trivial("trivial-3alt", "trivial-3alt-branch", 0));
 
 	cl_assert(entry = git_index_get_bypath(repo_index, "new-in-3alt.txt", 0));
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -106,10 +105,9 @@ void test_merge_trivial__3alt(void)
 /* 4: ancest:(empty)^, head:head, remote:remote = result:no merge */
 void test_merge_trivial__4(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-4", "trivial-4-branch", 0));
+	cl_git_pass(merge_trivial("trivial-4", "trivial-4-branch", 0));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "new-and-different.txt", 0)) == NULL);
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -122,10 +120,9 @@ void test_merge_trivial__4(void)
 /* 5ALT: ancest:*, head:head, remote:head = result:head */
 void test_merge_trivial__5alt_1(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-5alt-1", "trivial-5alt-1-branch", 0));
+	cl_git_pass(merge_trivial("trivial-5alt-1", "trivial-5alt-1-branch", 0));
 
 	cl_assert(entry = git_index_get_bypath(repo_index, "new-and-same.txt", 0));
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -135,10 +132,9 @@ void test_merge_trivial__5alt_1(void)
 /* 5ALT: ancest:*, head:head, remote:head = result:head */
 void test_merge_trivial__5alt_2(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-5alt-2", "trivial-5alt-2-branch", 0));
+	cl_git_pass(merge_trivial("trivial-5alt-2", "trivial-5alt-2-branch", 0));
 
 	cl_assert(entry = git_index_get_bypath(repo_index, "modified-to-same.txt", 0));
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -148,10 +144,9 @@ void test_merge_trivial__5alt_2(void)
 /* 6: ancest:ancest+, head:(empty), remote:(empty) = result:no merge */
 void test_merge_trivial__6(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-6", "trivial-6-branch", 0));
+	cl_git_pass(merge_trivial("trivial-6", "trivial-6-branch", 0));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-both.txt", 0)) == NULL);
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -163,11 +158,10 @@ void test_merge_trivial__6(void)
 /* 6: ancest:ancest+, head:(empty), remote:(empty) = result:no merge */
 void test_merge_trivial__6_automerge(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 	const git_index_reuc_entry *reuc;
 
-	cl_assert(result = merge_trivial("trivial-6", "trivial-6-branch", 1));
+	cl_git_pass(merge_trivial("trivial-6", "trivial-6-branch", 1));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-both.txt", 0)) == NULL);
 	cl_assert(git_index_reuc_entrycount(repo_index) == 1);
@@ -179,10 +173,9 @@ void test_merge_trivial__6_automerge(void)
 /* 8: ancest:ancest^, head:(empty), remote:ancest = result:no merge */
 void test_merge_trivial__8(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-8", "trivial-8-branch", 0));
+	cl_git_pass(merge_trivial("trivial-8", "trivial-8-branch", 0));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-8.txt", 0)) == NULL);
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -195,11 +188,10 @@ void test_merge_trivial__8(void)
 /* 8: ancest:ancest^, head:(empty), remote:ancest = result:no merge */
 void test_merge_trivial__8_automerge(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 	const git_index_reuc_entry *reuc;
 
-	cl_assert(result = merge_trivial("trivial-8", "trivial-8-branch", 1));
+	cl_git_pass(merge_trivial("trivial-8", "trivial-8-branch", 1));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-8.txt", 0)) == NULL);
 
@@ -212,10 +204,9 @@ void test_merge_trivial__8_automerge(void)
 /* 7: ancest:ancest+, head:(empty), remote:remote = result:no merge */
 void test_merge_trivial__7(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-7", "trivial-7-branch", 0));
+	cl_git_pass(merge_trivial("trivial-7", "trivial-7-branch", 0));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-7.txt", 0)) == NULL);
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -228,10 +219,9 @@ void test_merge_trivial__7(void)
 /* 7: ancest:ancest+, head:(empty), remote:remote = result:no merge */
 void test_merge_trivial__7_automerge(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-7", "trivial-7-branch", 0));
+	cl_git_pass(merge_trivial("trivial-7", "trivial-7-branch", 0));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-7.txt", 0)) == NULL);
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -244,10 +234,9 @@ void test_merge_trivial__7_automerge(void)
 /* 10: ancest:ancest^, head:ancest, remote:(empty) = result:no merge */
 void test_merge_trivial__10(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-10", "trivial-10-branch", 0));
+	cl_git_pass(merge_trivial("trivial-10", "trivial-10-branch", 0));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-10-branch.txt", 0)) == NULL);
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -260,11 +249,10 @@ void test_merge_trivial__10(void)
 /* 10: ancest:ancest^, head:ancest, remote:(empty) = result:no merge */
 void test_merge_trivial__10_automerge(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 	const git_index_reuc_entry *reuc;
 
-	cl_assert(result = merge_trivial("trivial-10", "trivial-10-branch", 1));
+	cl_git_pass(merge_trivial("trivial-10", "trivial-10-branch", 1));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-10-branch.txt", 0)) == NULL);
 
@@ -277,10 +265,9 @@ void test_merge_trivial__10_automerge(void)
 /* 9: ancest:ancest+, head:head, remote:(empty) = result:no merge */
 void test_merge_trivial__9(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-9", "trivial-9-branch", 0));
+	cl_git_pass(merge_trivial("trivial-9", "trivial-9-branch", 0));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-9-branch.txt", 0)) == NULL);
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -293,10 +280,9 @@ void test_merge_trivial__9(void)
 /* 9: ancest:ancest+, head:head, remote:(empty) = result:no merge */
 void test_merge_trivial__9_automerge(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-9", "trivial-9-branch", 1));
+	cl_git_pass(merge_trivial("trivial-9", "trivial-9-branch", 1));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-9-branch.txt", 0)) == NULL);
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
@@ -309,11 +295,10 @@ void test_merge_trivial__9_automerge(void)
 /* 13: ancest:ancest+, head:head, remote:ancest = result:head */
 void test_merge_trivial__13(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 	git_oid expected_oid;
 
-	cl_assert(result = merge_trivial("trivial-13", "trivial-13-branch", 0));
+	cl_git_pass(merge_trivial("trivial-13", "trivial-13-branch", 0));
 
 	cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-13.txt", 0));
 	cl_git_pass(git_oid_fromstr(&expected_oid, "1cff9ec6a47a537380dedfdd17c9e76d74259a2b"));
@@ -326,11 +311,10 @@ void test_merge_trivial__13(void)
 /* 14: ancest:ancest+, head:ancest, remote:remote = result:remote */
 void test_merge_trivial__14(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 	git_oid expected_oid;
 
-	cl_assert(result = merge_trivial("trivial-14", "trivial-14-branch", 0));
+	cl_git_pass(merge_trivial("trivial-14", "trivial-14-branch", 0));
 
 	cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-14-branch.txt", 0));
 	cl_git_pass(git_oid_fromstr(&expected_oid, "26153a3ff3649b6c2bb652d3f06878c6e0a172f9"));
@@ -343,10 +327,9 @@ void test_merge_trivial__14(void)
 /* 11: ancest:ancest+, head:head, remote:remote = result:no merge */
 void test_merge_trivial__11(void)
 {
-	git_merge_result *result;
 	const git_index_entry *entry;
 
-	cl_assert(result = merge_trivial("trivial-11", "trivial-11-branch", 0));
+	cl_git_pass(merge_trivial("trivial-11", "trivial-11-branch", 0));
 
 	cl_assert((entry = git_index_get_bypath(repo_index, "modified-in-both.txt", 0)) == NULL);
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
diff --git a/tests-clar/treediff/many.c b/tests-clar/treediff/many.c
index 6a6b6dab6..e32ba3645 100644
--- a/tests-clar/treediff/many.c
+++ b/tests-clar/treediff/many.c
@@ -85,7 +85,7 @@ static int treediff(
         cl_git_pass(git_tree_lookup(&trees[i], repo, &oids[i]));
     }
     
-    cl_git_pass(git_diff_tree_many(repo, trees, treediff_data->trees_len, flags, treediff_cb, treediff_data));
+    cl_git_pass(git_diff_tree_many(repo, (const git_tree **)trees, treediff_data->trees_len, flags, treediff_cb, treediff_data));
     
     cl_assert(treediff_data->seen == treediff_data->file_data_len);