merge: don't try to malloc(0)

31e84edb · Edward Thomson · 419ffdde · 31e84edb
Commit 31e84edb authored Jul 19, 2021 by Edward Thomson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

src/merge.c
+2 -1

No files found.
--- a/src/merge.c
+++ b/src/merge.c
@@ -1535,7 +1535,8 @@ int git_merge_diff_list__find_renames(
 	GIT_ASSERT_ARG(diff_list);
 	GIT_ASSERT_ARG(opts);

-	if ((opts->flags & GIT_MERGE_FIND_RENAMES) == 0)
+	if ((opts->flags & GIT_MERGE_FIND_RENAMES) == 0 ||
+	    !diff_list->conflicts.length)
 		return 0;

 	similarity_ours = git__calloc(diff_list->conflicts.length,