mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/rerere-multi-stage-1-fix'

Browse Source 
A corner case bugfix in "git rerere" code.

* en/rerere-multi-stage-1-fix:
  rerere: avoid buffer overrun
  t4200: demonstrate rerere segfault on specially crafted merge
This commit is contained in:
Junio C Hamano
2018-09-24 10:30:48 -07:00
parent e3d4ff037d ad2bf0d9b4
commit bd3941a0ae
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rerere.c
View File

@ -521,7 +521,7 @@ static int check_one_conflict(int i, int *type)
}
*type = PUNTED;
while (ce_stage(active_cache[i]) == 1)
while (i < active_nr && ce_stage(active_cache[i]) == 1)
i++;
/* Only handle regular files with both stages #2 and #3 */