diff options
| author | Matt Broadstone <mbroadst@mongodb.com> | 2022-01-04 16:05:44 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-04 16:36:52 +0000 |
| commit | 863684a584bfa5b4beeffb8d2a79e735299c1de7 (patch) | |
| tree | 420218438718bf09c68cf7655cb1755b0bb004d8 | |
| parent | 2295d0afb02a5954e9ea359962e9537c89265c74 (diff) | |
| download | mongo-863684a584bfa5b4beeffb8d2a79e735299c1de7.tar.gz | |
SERVER-62333 use std::ptrdiff_t to avoid UB in MurmurHash3
| -rw-r--r-- | src/third_party/murmurhash3/MurmurHash3.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/third_party/murmurhash3/MurmurHash3.cpp b/src/third_party/murmurhash3/MurmurHash3.cpp index 03940090b6d..62a0fbeee9b 100644 --- a/src/third_party/murmurhash3/MurmurHash3.cpp +++ b/src/third_party/murmurhash3/MurmurHash3.cpp @@ -82,6 +82,8 @@ FORCE_INLINE T nativeToLittle( T t ) return t; } +template <typename T> constexpr std::ptrdiff_t ssizeof = sizeof(T); + //----------------------------------------------------------------------------- // Block read - if your platform needs to do endian-swapping or can only // handle aligned reads, do the conversion here @@ -89,7 +91,7 @@ template <typename T> FORCE_INLINE T getblock( const void* p, int i ) { T t; - std::memcpy(&t, static_cast<const char*>(p) + i * sizeof(T), sizeof(T)); + std::memcpy(&t, static_cast<const char*>(p) + i * ssizeof<T>, sizeof(T)); return nativeToLittle(t); } @@ -108,7 +110,7 @@ template <typename T> FORCE_INLINE void putblock( void* p, int i, T t ) { t = nativeToLittle(t); - std::memcpy(static_cast<char*>(p) + i * sizeof(T), &t, sizeof(T)); + std::memcpy(static_cast<char*>(p) + i * ssizeof<T>, &t, sizeof(T)); } //----------------------------------------------------------------------------- |