diff options
| author | Jeff King <peff@peff.net> | 2017-08-09 16:34:02 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2017-08-09 16:34:02 -0400 |
| commit | 09930192b903e15d5c55afc2fd83d6f37ba6edd9 (patch) | |
| tree | a555240b3f73cdc57e9a38155d7fac2b72f6c908 | |
| parent | a9d6b9d529daa920b558ee3f34151422d10bc95e (diff) | |
| download | libgit2-peff/binary-search-do-while.tar.gz | |
sha1_position: convert do-while to whilepeff/binary-search-do-while
If we enter the sha1_position() function with "lo == hi",
we have no elements. But the do-while loop means that we'll
enter the loop body once anyway, picking "mi" at that same
value and comparing nonsense to our desired key. This is
unlikely to match in practice, but we still shouldn't be
looking at the memory in the first place.
This bug is inherited from git.git; it was fixed there in
e01580cfe01526ec2c4eb4899f776a82ade7e0e1.
| -rw-r--r-- | src/sha1_lookup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sha1_lookup.c b/src/sha1_lookup.c index ead26de06..60a7444be 100644 --- a/src/sha1_lookup.c +++ b/src/sha1_lookup.c @@ -232,7 +232,7 @@ int sha1_position(const void *table, { const unsigned char *base = table; - do { + while (lo < hi) { unsigned mi = (lo + hi) / 2; int cmp = git_oid__hashcmp(base + mi * stride, key); @@ -243,7 +243,7 @@ int sha1_position(const void *table, hi = mi; else lo = mi+1; - } while (lo < hi); + } return -((int)lo)-1; } |