From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 2 Nov 2014 16:48:08 +0000 (-0500)
Subject: Use the | trick to save a comparison in our calloc check.
X-Git-Tag: tor-0.2.6.2-alpha~118^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ded33cb2c73151e2f02a8a1d520b54e4f1c14072;p=thirdparty%2Ftor.git

Use the | trick to save a comparison in our calloc check.
---

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