diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:37 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:38 -0700 |
commit | 891c1c280f070998428868d9a175c89341f8c982 (patch) | |
tree | 8678828ba73e9a971237cbcfb58426789000c143 /builtin | |
parent | Merge branch 'pw/add-p-recount' (diff) | |
parent | cleanup: fix possible overflow errors in binary search, part 2 (diff) | |
download | tgif-891c1c280f070998428868d9a175c89341f8c982.tar.xz |
Merge branch 'rs/avoid-overflow-in-midpoint-computation'
Code clean-up to avoid signed integer overlaps during binary search.
* rs/avoid-overflow-in-midpoint-computation:
cleanup: fix possible overflow errors in binary search, part 2
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/ls-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 7f83c9a6f2..670e8fb93c 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -373,7 +373,7 @@ static void prune_index(struct index_state *istate, first = pos; last = istate->cache_nr; while (last > first) { - int next = (last + first) >> 1; + int next = first + ((last - first) >> 1); const struct cache_entry *ce = istate->cache[next]; if (!strncmp(ce->name, prefix, prefixlen)) { first = next+1; |