summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2020-12-19 09:57:11 +0000
committerGitHub <noreply@github.com>2020-12-19 09:57:11 +0000
commita67e5e0883c79e86e4895201292296f61b719b6c (patch)
tree740684ab0147590869652acc4c7ff2352bb80cd8
parentc76e9f22912e3b987a4e4590eb386477ae114f85 (diff)
parente9b98cd53089077cb3c547b6f3870c51e3b128cc (diff)
downloadlibgit2-a67e5e0883c79e86e4895201292296f61b719b6c.tar.gz
Merge pull request #5743 from lhchavez/fix-clang-32-bit-tests
Third attempt to fix the 32-bit version of `git__multiply_int64_overf…
-rw-r--r--src/integer.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/integer.h b/src/integer.h
index 28122a99f..724e076a0 100644
--- a/src/integer.h
+++ b/src/integer.h
@@ -166,11 +166,18 @@ GIT_INLINE(bool) git__add_int64_overflow(int64_t *out, int64_t one, int64_t two)
#if !defined(git__multiply_int64_overflow)
GIT_INLINE(bool) git__multiply_int64_overflow(int64_t *out, int64_t one, int64_t two)
{
- if ((one == -1 && two == INT_MIN) ||
- (two == -1 && one == INT_MIN) ||
- (one && INT64_MAX / one < two) ||
- (one && INT64_MIN / one > two))
+ if ((one == -1 && two == INT64_MIN) ||
+ (two == -1 && one == INT64_MIN))
return true;
+ if (one && two) {
+ if (one > 0 == two > 0) {
+ if (INT64_MAX / one < two)
+ return true;
+ } else {
+ if (INT64_MIN / one < two)
+ return true;
+ }
+ }
*out = one * two;
return false;
}