From: Mansour Moufid <mansourmoufid@gmail.com>
Date: Sun, 19 Oct 2014 16:11:53 +0000 (-0400)
Subject: Refactor the tor_reallocarray_ overflow check.
X-Git-Tag: tor-0.2.6.2-alpha~118^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3206dbdce1d055e30d84f9f5dd433c733fee3d8a;p=thirdparty%2Ftor.git

Refactor the tor_reallocarray_ overflow check.
---

diff --git a/src/common/util.c b/src/common/util.c
index 929eb5ffb2..6e30c47bf9 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -262,7 +262,7 @@ tor_reallocarray_(void *ptr, size_t sz1, size_t sz2 DMALLOC_PARAMS)
 {
   /* XXXX we can make this return 0, but we would need to check all the
    * reallocarray users. */
-  tor_assert(sz2 == 0 || sz1 < SIZE_T_CEILING / sz2);
+  tor_assert(size_mul_check(sz1, sz2));
 
   return tor_realloc(ptr, (sz1 * sz2) DMALLOC_FN_ARGS);
 }