From 710f23aa35a1f67bd857ac0160638bfbbd28fb32 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 14 Jun 2017 12:54:38 +0200
Subject: [PATCH] COMP: hash-table size overflow with 64-bit labels (fixes
 #498)

- Requires (1L << N) instead of (1 << N), otherwise it overflows
  and the result is zero.
---
 applications/test/pTraits/Test-pTraits.C             | 12 ++++++------
 .../containers/HashTables/HashTable/HashTableCore.C  |  5 ++---
 .../HashTables/StaticHashTable/StaticHashTableCore.C |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/applications/test/pTraits/Test-pTraits.C b/applications/test/pTraits/Test-pTraits.C
index d300ddc87a..68d6a01527 100644
--- a/applications/test/pTraits/Test-pTraits.C
+++ b/applications/test/pTraits/Test-pTraits.C
@@ -92,14 +92,14 @@ int main()
     std::cout<< "max = " << pTraits<label>::max << nl;
     std::cout<< "umax = " << pTraits<uLabel>::max << nl;
 
-    std::cout<< "max_2 = " << pTraits<label>::max/2 << " == "
-        << (1 << (sizeof(label)*8-2)) << nl;
+    std::cout<< "max_2 = " << pTraits<label>::max/2 << " <=> "
+        << (1L << (sizeof(label)*8-2)) << nl;
 
-    std::cout<< "max_4 = " << pTraits<label>::max/4 << " == "
-        << (1 << (sizeof(label)*8-3)) << nl;
+    std::cout<< "max_4 = " << pTraits<label>::max/4 << " <=> "
+        << (1L << (sizeof(label)*8-3)) << nl;
 
-    std::cout<< "max_8 = " << pTraits<label>::max/8 << " == "
-        << (1 << (sizeof(label)*8-4)) << nl;
+    std::cout<< "max_8 = " << pTraits<label>::max/8 << " <=> "
+        << (1L << (sizeof(label)*8-4)) << nl;
 
     Info<< "End\n" << endl;
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.C
index 9a8b205b9e..08805148a9 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.C
@@ -33,9 +33,8 @@ namespace Foam
 defineTypeNameAndDebug(HashTableCore, 0);
 }
 
-
 // Approximately labelMax/4
-const Foam::label Foam::HashTableCore::maxTableSize(1 << (sizeof(label)*8-3));
+const Foam::label Foam::HashTableCore::maxTableSize(1L << (sizeof(label)*8-3));
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
@@ -59,7 +58,7 @@ Foam::label Foam::HashTableCore::canonicalSize(const label requested_size)
     // - The upper limit (approx. labelMax/4) must be a power of two,
     //   need not be extremely large for hashing.
 
-    uLabel powerOfTwo = 8; // lower-limit
+    uLabel powerOfTwo = 8u; // lower-limit
 
     const uLabel size = requested_size;
     if (size <= powerOfTwo)
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableCore.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableCore.C
index 6ce8fc31ba..b53b5554bf 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableCore.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableCore.C
@@ -35,7 +35,7 @@ defineTypeNameAndDebug(StaticHashTableCore, 0);
 
 
 // Approximately labelMax/4
-static const Foam::label maxTableSize(1 << (sizeof(Foam::label)*8-3));
+static const Foam::label maxTableSize(1L << (sizeof(Foam::label)*8-3));
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
@@ -59,7 +59,7 @@ Foam::label Foam::StaticHashTableCore::canonicalSize(const label requested_size)
     // - The upper limit (approx. labelMax/4) must be a power of two,
     //   need not be extremely large for hashing.
 
-    uLabel powerOfTwo = 8; // lower-limit
+    uLabel powerOfTwo = 8u; // lower-limit
 
     const uLabel size = requested_size;
     if (size <= powerOfTwo)