summaryrefslogtreecommitdiffstats
path: root/compat/regex/regexec.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2017-10-08 20:29:37 +0200
committerJunio C Hamano <gitster@pobox.com>2017-10-10 01:57:24 +0200
commit19716b21a4255ecc7148b54ab2c78039c59f25bf (patch)
tree5f1cecbffc543c64e7c4c4f371d204424e1ce1bb /compat/regex/regexec.c
parentGit 2.15-rc0 (diff)
downloadgit-19716b21a4255ecc7148b54ab2c78039c59f25bf.tar.xz
git-19716b21a4255ecc7148b54ab2c78039c59f25bf.zip
cleanup: fix possible overflow errors in binary search
A common mistake when writing binary search is to allow possible integer overflow by using the simple average: mid = (min + max) / 2; Instead, use the overflow-safe version: mid = min + (max - min) / 2; This translation is safe since the operation occurs inside a loop conditioned on "min < max". The included changes were found using the following git grep: git grep '/ *2;' '*.c' Making this cleanup will prevent future review friction when a new binary search is contructed based on existing code. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/regex/regexec.c')
-rw-r--r--compat/regex/regexec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c
index 0a745d9c3b..6f2b48a78b 100644
--- a/compat/regex/regexec.c
+++ b/compat/regex/regexec.c
@@ -4284,7 +4284,7 @@ search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx)
last = right = mctx->nbkref_ents;
for (left = 0; left < right;)
{
- mid = (left + right) / 2;
+ mid = left + (right - left) / 2;
if (mctx->bkref_ents[mid].str_idx < str_idx)
left = mid + 1;
else