aboutsummaryrefslogtreecommitdiff
path: root/cache-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-11 14:52:24 +0900
committerJunio C Hamano <gitster@pobox.com>2017-10-11 14:52:24 +0900
commit7245ee3d6cd0c7eea81b57260badc6fcda5d8ffd (patch)
tree2fc0707b95acb28a22bc07c62a83878523d00ff0 /cache-tree.c
parent952cc9b9bd668c5f05c9faf81f80cea905642eec (diff)
parent19716b21a4255ecc7148b54ab2c78039c59f25bf (diff)
downloadgit-7245ee3d6cd0c7eea81b57260badc6fcda5d8ffd.tar.xz
Merge branch 'ds/avoid-overflow-in-midpoint-computation'
Code clean-up. * ds/avoid-overflow-in-midpoint-computation: cleanup: fix possible overflow errors in binary search
Diffstat (limited to 'cache-tree.c')
-rw-r--r--cache-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache-tree.c b/cache-tree.c
index 71d092ed51..d3f7401278 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -49,7 +49,7 @@ static int subtree_pos(struct cache_tree *it, const char *path, int pathlen)
lo = 0;
hi = it->subtree_nr;
while (lo < hi) {
- int mi = (lo + hi) / 2;
+ int mi = lo + (hi - lo) / 2;
struct cache_tree_sub *mdl = down[mi];
int cmp = subtree_name_cmp(path, pathlen,
mdl->name, mdl->namelen);