X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diffcore-rename.c;h=099d2a2367d79dd06e068eeb20177a3ec1d12d52;hb=38fd0721d0a2a1a723bc28fc0817e3571987b1ef;hp=dba965c0b4006251b1da04465d319c5fe9997ea4;hpb=302ebfe52192fff9a2c1c612dff22325fd073acc;p=git.git

diff --git a/diffcore-rename.c b/diffcore-rename.c
index dba965c0..099d2a23 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -168,7 +168,7 @@ static int estimate_similarity(struct diff_filespec *src,
 	delta_limit = base_size * (MAX_SCORE-minimum_score) / MAX_SCORE;
 	delta = diff_delta(src->data, src->size,
 			   dst->data, dst->size,
-			   &delta_size, delta_limit);
+			   &delta_size, delta_limit, NULL);
 	if (!delta)
 		/* If delta_limit is exceeded, we have too much differences */
 		return 0;
@@ -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,7 +284,7 @@ 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 ||
+	if (rename_dst_nr == 0 || rename_src_nr == 0 ||
 	    (0 < rename_limit && rename_limit < rename_dst_nr))
 		goto cleanup; /* nothing to do */