aboutsummaryrefslogtreecommitdiffstats
path: root/string-list.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 /string-list.c
parentMerge branch 'tb/complete-describe' (diff)
parentcleanup: fix possible overflow errors in binary search (diff)
downloadgit-7245ee3d6cd0c7eea81b57260badc6fcda5d8ffd.tar.gz
git-7245ee3d6cd0c7eea81b57260badc6fcda5d8ffd.zip
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 'string-list.c')
-rw-r--r--string-list.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/string-list.c b/string-list.c
index 806b4c8723..a0cf0cfe88 100644
--- a/string-list.c
+++ b/string-list.c
@@ -16,7 +16,7 @@ static int get_entry_index(const struct string_list *list, const char *string,
compare_strings_fn cmp = list->cmp ? list->cmp : strcmp;
while (left + 1 < right) {
- int middle = (left + right) / 2;
+ int middle = left + (right - left) / 2;
int compare = cmp(string, list->items[middle].string);
if (compare < 0)
right = middle;