X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fhash.c;h=aabd94c7d42cd0f51dfefbfb3769e26976df3ba4;hb=a230bea6a2fc33876ff46478449e466a6407c09d;hp=e5f2e0076d74153644ce7618a3ed465d7ef97c6d;hpb=6b6a025488f289f749498a7e6cc1994be19f53e8;p=meshlink

diff --git a/src/hash.c b/src/hash.c
index e5f2e007..aabd94c7 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -1,6 +1,6 @@
 /*
     hash.c -- hash table management
-    Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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);
+	}
 }