From: Derrick Stolee Date: Thu, 7 May 2020 13:17:33 +0000 (+0000) Subject: unpack-trees: avoid array out-of-bounds error X-Git-Tag: v2.27.0-rc0~13^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0eeb3be4c4b297f9edb94c4741af606df396985d;p=thirdparty%2Fgit.git unpack-trees: avoid array out-of-bounds error The loop in warn_conflicted_path() that checks for the count of entries with the same path uses "i+count" for the array entry. However, the loop only verifies that the value of count is below the array size. Fix this by adding i to the condition. I hit this condition during a test of the in-tree sparse-checkout feature, so it is exercised by the end of the series. Signed-off-by: Derrick Stolee [jc: readability fix] Signed-off-by: Junio C Hamano --- diff --git a/unpack-trees.c b/unpack-trees.c index b43f3e775a..4bd0726eea 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -562,11 +562,11 @@ static int warn_conflicted_path(struct index_state *istate, add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path); - /* Find out how many higher stage entries at same path */ - while (++count < istate->cache_nr && - !strcmp(conflicting_path, - istate->cache[i+count]->name)) - /* do nothing */; + /* Find out how many higher stage entries are at same path */ + while ((++count) + i < istate->cache_nr && + !strcmp(conflicting_path, istate->cache[count + i]->name)) + ; /* do nothing */ + return count; }