Merge branch 'develop' into cmake/set-cmp0135

LLNL · Feb 17, 2024 · 1a93637 · 1a93637
2 parents 946dfff + f4f8d16
commit 1a93637
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -157,6 +157,10 @@ sundials_band.h
 
 Fixed [#329](https://github.com/LLNL/sundials/issues/329) so that C++20 aggregate initialization can be used.
 
+Fixed integer overflow in the internal SUNDIALS hashmap. This resolves
+[#409](https://github.com/LLNL/sundials/issues/409) and
+[#249](https://github.com/LLNL/sundials/issues/249)
+
 ## Changes to SUNDIALS in release 6.7.0
 
 Added the `SUNAdaptController` base class, ported ARKODE's internal

diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
@@ -313,6 +313,10 @@ rely on these are recommended to transition to the corresponding :c:type:`SUNMat
 Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
 that C++20 aggregate initialization can be used.
 
+Fixed integer overflow in the internal SUNDIALS hashmap. This resolves
+`GitHub Issues #409 <https://github.com/LLNL/sundials/issues/409>`_ and
+`#249 <https://github.com/LLNL/sundials/issues/249>`_.
+
 Changes in v5.7.0
 -----------------
 

diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
@@ -283,6 +283,10 @@ corresponding :c:type:`SUNMatrix` and :c:type:`SUNLinearSolver` modules:
 Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
 that C++20 aggregate initialization can be used.
 
+Fixed integer overflow in the internal SUNDIALS hashmap. This resolves
+`GitHub Issues #409 <https://github.com/LLNL/sundials/issues/409>`_ and
+`#249 <https://github.com/LLNL/sundials/issues/249>`_.
+
 Changes in v6.7.0
 -----------------
 

diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
@@ -283,6 +283,10 @@ corresponding :c:type:`SUNMatrix` and :c:type:`SUNLinearSolver` modules:
 Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
 that C++20 aggregate initialization can be used.
 
+Fixed integer overflow in the internal SUNDIALS hashmap. This resolves
+`GitHub Issues #409 <https://github.com/LLNL/sundials/issues/409>`_ and
+`#249 <https://github.com/LLNL/sundials/issues/249>`_.
+
 Changes in v6.7.0
 -----------------
 

diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
@@ -244,6 +244,10 @@ corresponding :c:type:`SUNMatrix` and :c:type:`SUNLinearSolver` modules:
 Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
 that C++20 aggregate initialization can be used.
 
+Fixed integer overflow in the internal SUNDIALS hashmap. This resolves
+`GitHub Issues #409 <https://github.com/LLNL/sundials/issues/409>`_ and
+`#249 <https://github.com/LLNL/sundials/issues/249>`_.
+
 Changes in v6.7.0
 -----------------
 

diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
@@ -258,6 +258,10 @@ corresponding :c:type:`SUNMatrix` and :c:type:`SUNLinearSolver` modules:
 Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
 that C++20 aggregate initialization can be used.
 
+Fixed integer overflow in the internal SUNDIALS hashmap. This resolves
+`GitHub Issues #409 <https://github.com/LLNL/sundials/issues/409>`_ and
+`#249 <https://github.com/LLNL/sundials/issues/249>`_.
+
 Changes in v5.7.0
 -----------------
 

diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
@@ -239,6 +239,10 @@ corresponding :c:type:`SUNMatrix` and :c:type:`SUNLinearSolver` modules:
 Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
 that C++20 aggregate initialization can be used.
 
+Fixed integer overflow in the internal SUNDIALS hashmap. This resolves
+`GitHub Issues #409 <https://github.com/LLNL/sundials/issues/409>`_ and
+`#249 <https://github.com/LLNL/sundials/issues/249>`_.
+
 Changes in v6.7.0
 -----------------
 

diff --git a/src/sundials/sundials_hashmap.h b/src/sundials/sundials_hashmap.h
@@ -20,14 +20,15 @@
 #ifndef _SUNDIALS_HASHMAP_H
 #define _SUNDIALS_HASHMAP_H
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "sundials/sundials_errors.h"
 #include "sundials/sundials_types.h"
 
-static const unsigned long HASH_PRIME        = 14695981039346656037U;
-static const unsigned long HASH_OFFSET_BASIS = 1099511628211U;
+static const uint64_t HASH_PRIME        = 14695981039346656037U;
+static const uint64_t HASH_OFFSET_BASIS = 1099511628211U;
 
 /*
   For a nice discussion on popular hashing algorithms see:
@@ -36,9 +37,9 @@ static const unsigned long HASH_OFFSET_BASIS = 1099511628211U;
   This is a 64-bit implementation of the 'a' modification of the
   Fowler–Noll–Vo hash (i.e., FNV1-a).
  */
-static unsigned long fnv1a_hash(const char* str)
+static uint64_t fnv1a_hash(const char* str)
 {
-  unsigned long hash = HASH_OFFSET_BASIS;
+  uint64_t hash = HASH_OFFSET_BASIS;
   char c;
   while ((c = *str++)) { hash = (hash ^ c) * HASH_PRIME; }
   return hash;