X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fhash.c;h=a40e7996613150b436e0ba2ffc329b429defe413;hb=51c1639884b409a98a4581a7b661ef65b94e9d86;hp=1d203c5cb31194982e6920cf5c063cee2ee43de0;hpb=d2b19be1a0dd3c4987aa926117f5bf281892c78b;p=tinc diff --git a/src/hash.c b/src/hash.c index 1d203c5c..a40e7996 100644 --- a/src/hash.c +++ b/src/hash.c @@ -29,7 +29,7 @@ static uint32_t hash_function(const void *p, size_t len) { uint32_t hash = 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; @@ -52,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_and_zero(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; }