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

Merge branch 'ds/sparse-updates-oob-access-fix'

Browse Source 
The code to skip unmerged paths in the index when sparse checkout
is in use would have made out-of-bound access of the in-core index
when the last path was unmerged, which has been corrected.

* ds/sparse-updates-oob-access-fix:
  unpack-trees: avoid array out-of-bounds error
This commit is contained in:
Junio C Hamano 2020-05-13 12:19:20 -07:00
commit ce1adb1157
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unpack-trees.c
View File

@ -562,11 +562,11 @@ static int warn_conflicted_path(struct index_state *istate,
add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path); add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path);
/* Find out how many higher stage entries at same path */ /* Find out how many higher stage entries are at same path */
while (++count < istate->cache_nr && while ((++count) + i < istate->cache_nr &&
!strcmp(conflicting_path, !strcmp(conflicting_path, istate->cache[count + i]->name))
istate->cache[i+count]->name)) ; /* do nothing */
/* do nothing */;
return count; return count;
} }