X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-rename.c;h=ffd126af0d2cd3539e0f186e83c7671132758e6b;hb=49cc27bb46dc5dddc59c9802c1eed1ee6126537e;hp=e17dd90058443ea75321f8c48818bd0094bd76a3;hpb=8082d8d3050e3fdd7b0f13c7a7b3ad68af7f478a;p=git.git

diff --git a/diffcore-rename.c b/diffcore-rename.c
index e17dd900..ffd126af 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -176,8 +176,10 @@ static int estimate_similarity(struct diff_filespec *src,
 	/* A delta that has a lot of literal additions would have
 	 * big delta_size no matter what else it does.
 	 */
-	if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
+	if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) {
+		free(delta);
 		return 0;
+	}
 
 	/* Estimate the edit size by interpreting delta. */
 	if (count_delta(delta, delta_size, &src_copied, &literal_added)) {
@@ -282,8 +284,8 @@ void diffcore_rename(struct diff_options *options)
 		else if (detect_rename == DIFF_DETECT_COPY)
 			register_rename_src(p->one, 1);
 	}
-	if (rename_dst_nr == 0 ||
-	    (0 <= rename_limit && rename_limit < rename_dst_nr))
+	if (rename_dst_nr == 0 || rename_src_nr == 0 ||
+	    (0 < rename_limit && rename_limit < rename_dst_nr))
 		goto cleanup; /* nothing to do */
 
 	/* We really want to cull the candidates list early
@@ -307,6 +309,9 @@ void diffcore_rename(struct diff_options *options)
 	if (rename_count == rename_dst_nr)
 		goto cleanup;
 
+	if (minimum_score == MAX_SCORE)
+		goto cleanup;
+
 	num_create = (rename_dst_nr - rename_count);
 	num_src = rename_src_nr;
 	mx = xmalloc(sizeof(*mx) * num_create * num_src);