path: root/sh-i18n--envsubst.c
diff options
authorRené Scharfe <>2019-06-13 17:51:56 (GMT)
committerJunio C Hamano <>2019-06-13 18:28:53 (GMT)
commit568a05c5ecb8e3a01fcb90d0f81857f49ef2add8 (patch)
treee85ff4b06b04fd9427a417c7c7b41ad73c0bd6dc /sh-i18n--envsubst.c
parentb697d92f56511e804b8ba20ccbe7bdc85dc66810 (diff)
cleanup: fix possible overflow errors in binary search, part 2
Calculating the sum of two array indexes to find the midpoint between them can overflow, i.e. code like this is unsafe for big arrays: mid = (first + last) >> 1; Make sure the intermediate value stays within the boundaries instead, like this: mid = first + ((last - first) >> 1); The loop condition of the binary search makes sure that 'last' is always greater than 'first', so this is safe as long as 'first' is not negative. And that can be verified easily using the pre-context of each change, except for name-hash.c, so add an assertion to that effect there. The unsafe calculations were found with: git grep '(.*+.*) *>> *1' This is a continuation of 19716b21a4 (cleanup: fix possible overflow errors in binary search, 2017-10-08). Signed-off-by: Rene Scharfe <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'sh-i18n--envsubst.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
index cecfdd3..e7430b9 100644
--- a/sh-i18n--envsubst.c
+++ b/sh-i18n--envsubst.c
@@ -249,7 +249,7 @@ sorted_string_list_member (const string_list_ty *slp, const char *s)
/* Here we know that if s is in the list, it is at an index j
with j1 <= j < j2. */
- size_t j = (j1 + j2) >> 1;
+ size_t j = j1 + ((j2 - j1) >> 1);
int result = strcmp (slp->item[j], s);
if (result > 0)