Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 18:48:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use larger size variable for DictEntry key_size to avoid overflows with big keys

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-10-04 18:05:25 -07:00
parent c132d140ae
commit d19478f49f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Dict.h
View file

@ -93,7 +93,7 @@ public:
// The size of the key. Less than 8 bytes we'll store directly in the entry, otherwise we'll // The size of the key. Less than 8 bytes we'll store directly in the entry, otherwise we'll
// store it as a pointer. This avoids extra allocations if we can help it. // store it as a pointer. This avoids extra allocations if we can help it.
uint16_t key_size = 0; uint32_t key_size = 0;
// Lower 4 bytes of the 8-byte hash, which is used to calculate the position in the table. // Lower 4 bytes of the 8-byte hash, which is used to calculate the position in the table.
uint32_t hash = 0; uint32_t hash = 0;
@ -104,7 +104,7 @@ public:
char* key; char* key;
}; };
DictEntry(void* arg_key, int key_size = 0, hash_t hash = 0, T* value = nullptr, DictEntry(void* arg_key, uint32_t key_size = 0, hash_t hash = 0, T* value = nullptr,
int16_t d = TOO_FAR_TO_REACH, bool copy_key = false) int16_t d = TOO_FAR_TO_REACH, bool copy_key = false)
: distance(d), key_size(key_size), hash((uint32_t)hash), value(value) : distance(d), key_size(key_size), hash((uint32_t)hash), value(value)
{ {
@ -158,7 +158,7 @@ public:
return std::make_unique<detail::HashKey>(GetKey(), key_size, hash); return std::make_unique<detail::HashKey>(GetKey(), key_size, hash);
} }
bool Equal(const char* arg_key, int arg_key_size, hash_t arg_hash) const bool Equal(const char* arg_key, uint32_t arg_key_size, hash_t arg_hash) const
{ // only 40-bit hash comparison. { // only 40-bit hash comparison.
return (0 == ((hash ^ arg_hash) & HASH_MASK)) && key_size == arg_key_size && return (0 == ((hash ^ arg_hash) & HASH_MASK)) && key_size == arg_key_size &&
0 == memcmp(GetKey(), arg_key, key_size); 0 == memcmp(GetKey(), arg_key, key_size);