admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix assertion. NULL pointer is accepted for HASH providing the size is 0

Browse Source
This commit is contained in:
Patrick Pelissier committed 2019-01-26 09:10:18 +01:00
1 parent b9514cbe72
commit 9863a8325c
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
m-core.h
+2 -2
View File
@@ -1664,7 +1664,7 @@ m_core_hash (const void *str, size_t length)
uint32_t hash32 = 2166136261U ^ M_HASH_SEED; uint32_t hash32 = 2166136261U ^ M_HASH_SEED;
const uint8_t *p = (const uint8_t *)str; const uint8_t *p = (const uint8_t *)str;
assert (str != NULL); assert (str != NULL || length == 0);
assert ( (( (uintptr_t)p & (sizeof(uint32_t)-1) ) == 0) || (length <= sizeof(uint32_t))); assert ( (( (uintptr_t)p & (sizeof(uint32_t)-1) ) == 0) || (length <= sizeof(uint32_t)));
while (length >= 2*sizeof(uint32_t)) { while (length >= 2*sizeof(uint32_t)) {
@@ -1697,7 +1697,7 @@ m_core_hash (const void *str, size_t length)
uint64_t hash64 = 14695981039346656037ULL ^ M_HASH_SEED; uint64_t hash64 = 14695981039346656037ULL ^ M_HASH_SEED;
const uint8_t *p = M_ASSIGN_CAST(const uint8_t *, str); const uint8_t *p = M_ASSIGN_CAST(const uint8_t *, str);
assert (str != NULL); assert (str != NULL || length == 0);
assert ( (( (uintptr_t)p & (sizeof(uint64_t)-1) ) == 0) || (length <= sizeof(uint32_t))); assert ( (( (uintptr_t)p & (sizeof(uint64_t)-1) ) == 0) || (length <= sizeof(uint32_t)));
while (length >= 2*sizeof(uint64_t)) { while (length >= 2*sizeof(uint64_t)) {