From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Mon, 30 Apr 2018 15:36:50 +0000 (+0200)
Subject: Avoid signed overflow in Testing::rand
X-Git-Tag: v9.0.0-rc1~57^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b50fb5b3a4f8c993ee911e156b6853bdb9676c;p=dealii.git

Avoid signed overflow in Testing::rand
---

diff --git a/tests/tests.h b/tests/tests.h
index eb4f362202..910bbca72d 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -140,6 +140,18 @@ number get_real_assert_zero_imag(const number &a)
 // we put this into a namespace to not conflict with stdlib
 namespace Testing
 {
+  template <typename Number>
+  Number nonoverflow_add (Number a, Number b)
+  {
+    constexpr Number max = std::numeric_limits<Number>::max();
+    constexpr Number min = std::numeric_limits<Number>::min();
+    if (b > 0 && a > max-b)
+      return (min+a)+(b-max)-1;
+    if (b < 0 && a < min-b)
+      return (max+a)+(b-min)+1;
+    return a+b;
+  }
+
   int rand(const bool reseed=false,
            const int seed=1)
   {
@@ -157,7 +169,7 @@ namespace Testing
           {
             // This does:
             //   r[i] = (16807 * r[i-1]) % 2147483647;
-            // buit avoids overflowing 31 bits.
+            // but avoids overflowing 31 bits.
             const long int hi = word / 127773;
             const long int lo = word % 127773;
             word = 16807 * lo - 2836 * hi;
@@ -174,7 +186,7 @@ namespace Testing
 
         for (int i=34; i<344; i++)
           {
-            r[k%32] = r[(k+32-31)%32] + r[(k+32-3)%32];
+            r[k%32] = nonoverflow_add(r[(k+32-31)%32], r[(k+32-3)%32]);
             k=(k+1)%32;
           }
         inited=true;
@@ -182,7 +194,7 @@ namespace Testing
           return 0;// do not generate new no
       }
 
-    r[k%32] = r[(k+32-31)%32] + r[(k+32-3)%32];
+    r[k%32] = nonoverflow_add(r[(k+32-31)%32], r[(k+32-3)%32]);
     int ret = r[k%32];
     k=(k+1)%32;
     return (unsigned int)ret >> 1;