undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Junio C Hamano 2018-11-21 22:57:46 +09:00
commit a357daeac6
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linear-assignment.c
View File

@ -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);

5
t/t3206-range-diff.sh
View File

@ -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