Merge pull request libgit2#4277 from pks-t/pks/merge-coverity-fix

ethomson · web-flow · commit fa94875295bb · 2017-06-21T13:08:45.000+01:00
merge: fix potential free of uninitialized memory
diff --git a/src/merge.c b/src/merge.c
@@ -1165,7 +1165,7 @@ static int merge_diff_mark_similarity_exact(
 {
 	size_t i, j;
 	git_merge_diff *conflict_src, *conflict_tgt;
-	git_oidmap *ours_deletes_by_oid, *theirs_deletes_by_oid;
+	git_oidmap *ours_deletes_by_oid = NULL, *theirs_deletes_by_oid = NULL;
 	int error = 0;
 
 	if (!(ours_deletes_by_oid = git_oidmap_alloc()) ||

Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,7 @@ static int merge_diff_mark_similarity_exact(`
`1165`	`1165`	`{`
`1166`	`1166`	`size_t i, j;`
`1167`	`1167`	`git_merge_diff conflict_src, conflict_tgt;`
`1168`		`- git_oidmap ours_deletes_by_oid, theirs_deletes_by_oid;`
	`1168`	`+ git_oidmap ours_deletes_by_oid = NULL, theirs_deletes_by_oid = NULL;`
`1169`	`1169`	`int error = 0;`
`1170`	`1170`
`1171`	`1171`	`if (!(ours_deletes_by_oid = git_oidmap_alloc()) \|\|`