X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fhash.c;h=a40e7996613150b436e0ba2ffc329b429defe413;hb=51c1639884b409a98a4581a7b661ef65b94e9d86;hp=e5f2e0076d74153644ce7618a3ed465d7ef97c6d;hpb=6dfdb323612184529b4b83c1be914dda8262de47;p=tinc

diff --git a/src/hash.c b/src/hash.c
index e5f2e007..a40e7996 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -27,10 +27,12 @@
 static uint32_t hash_function(const void *p, size_t len) {
 	const uint8_t *q = p;
 	uint32_t hash = 0;
-	while(len > 0) {
+	while(true) {
 		for(int i = len > 4 ? 4 : len; --i;)
-			hash += q[i] << (8 * i);
+			hash += q[len - i] << (8 * i);
 		hash *= 0x9e370001UL; // Golden ratio prime.
+		if(len <= 4)
+			break;
 		len -= 4;
 	}
 	return hash;
@@ -50,11 +52,11 @@ static uint32_t modulo(uint32_t hash, size_t n) {
 /* (De)allocation */
 
 hash_t *hash_alloc(size_t n, size_t size) {
-	hash_t *hash = xmalloc_and_zero(sizeof *hash);
+	hash_t *hash = xzalloc(sizeof *hash);
 	hash->n = n;
 	hash->size = size;
-	hash->keys = xmalloc(hash->n * hash->size);
-	hash->values = xmalloc_and_zero(hash->n * sizeof *hash->values);
+	hash->keys = xzalloc(hash->n * hash->size);
+	hash->values = xzalloc(hash->n * sizeof *hash->values);
 	return hash;
 }
 
@@ -98,6 +100,8 @@ void hash_clear(hash_t *hash) {
 void hash_resize(hash_t *hash, size_t n) {
 	hash->keys = xrealloc(hash->keys, n * hash->size);
 	hash->values = xrealloc(hash->values, n * sizeof *hash->values);
-	if(n > hash->n)
+	if(n > hash->n) {
+		memset(hash->keys + hash->n * hash->size, 0, (n - hash->n) * hash->size);
 		memset(hash->values + hash->n, 0, (n - hash->n) * sizeof *hash->values);
+	}
 }