summaryrefslogtreecommitdiff
path: root/packfile.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 /packfile.c
parent952cc9b9bd668c5f05c9faf81f80cea905642eec (diff)
parent19716b21a4255ecc7148b54ab2c78039c59f25bf (diff)
downloadgit-7245ee3d6cd0c7eea81b57260badc6fcda5d8ffd.tar.gz
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 'packfile.c')
-rw-r--r--packfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/packfile.c b/packfile.c
index eab7542487..4a5fe7ab18 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1743,7 +1743,7 @@ off_t find_pack_entry_one(const unsigned char *sha1,
sha1[0], sha1[1], sha1[2], lo, hi, p->num_objects);
while (lo < hi) {
- unsigned mi = (lo + hi) / 2;
+ unsigned mi = lo + (hi - lo) / 2;
int cmp = hashcmp(index + mi * stride, sha1);
if (debug_lookup)