Merge branch 'tg/range-diff-corner-case-fix' into maint

gitster · gitster · commit a357daeac6b9 · 2018-11-21T22:57:46.000+09:00
Recently added "range-diff" had a corner-case bug to cause it
segfault, which has been corrected.

* tg/range-diff-corner-case-fix:
  linear-assignment: fix potential out of bounds memory access
diff --git a/linear-assignment.c b/linear-assignment.c
@@ -19,6 +19,12 @@ void compute_assignment(int column_count, int row_count, int *cost,
 	int *free_row, free_count = 0, saved_free_count, *pred, *col;
 	int i, j, phase;
 
+	if (column_count < 2) {
+		memset(column2row, 0, sizeof(int) * column_count);
+		memset(row2column, 0, sizeof(int) * row_count);
+		return;
+	}
+
 	memset(column2row, -1, sizeof(int) * column_count);
 	memset(row2column, -1, sizeof(int) * row_count);
 	ALLOC_ARRAY(v, column_count);
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
@@ -142,4 +142,9 @@ test_expect_success 'changed message' '
 	test_cmp expected actual
 '
 
+test_expect_success 'no commits on one side' '
+	git commit --amend -m "new message" &&
+	git range-diff master HEAD@{1} HEAD
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -142,4 +142,9 @@ test_expect_success 'changed message' '`
`142`	`142`	`test_cmp expected actual`
`143`	`143`	`'`
`144`	`144`
	`145`	`+test_expect_success 'no commits on one side' '`
	`146`	`+ git commit --amend -m "new message" &&`
	`147`	`+ git range-diff master HEAD@{1} HEAD`
	`148`	`+'`
	`149`	`+`
`145`	`150`	`test_done`