summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/util.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 006fd804b1..3d81f2b530 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -206,8 +206,15 @@ tor_malloc_zero_(size_t size DMALLOC_PARAMS)
static INLINE int
size_mul_check(const size_t x, const size_t y)
{
- return ((x < SQRT_SIZE_MAX_P1 && y < SQRT_SIZE_MAX_P1) ||
- y == 0 || x <= SIZE_MAX / y);
+ /* This first check is equivalent to
+ (x < SQRT_SIZE_MAX_P1 && y < SQRT_SIZE_MAX_P1)
+
+ Rationale: if either one of x or y is >= SQRT_SIZE_MAX_P1, then it
+ will have some bit set in its most significant half.
+ */
+ return ((x|y) < SQRT_SIZE_MAX_P1 ||
+ y == 0 ||
+ x <= SIZE_MAX / y);
}
/** Allocate a chunk of <b>nmemb</b>*<b>size</b> bytes of memory, fill