From d2b19be1a0dd3c4987aa926117f5bf281892c78b Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Thu, 29 Nov 2012 14:35:08 +0100 Subject: [PATCH] Fix use of unitialised values in hash tables. Not only was Valgrind unhappy about it, it could also result in cache misses. --- src/hash.c | 6 ++++-- src/netutl.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/hash.c b/src/hash.c index cf5ba90a..1d203c5c 100644 --- a/src/hash.c +++ b/src/hash.c @@ -55,7 +55,7 @@ hash_t *hash_alloc(size_t n, size_t size) { hash_t *hash = xmalloc_and_zero(sizeof *hash); hash->n = n; hash->size = size; - hash->keys = xmalloc(hash->n * hash->size); + hash->keys = xmalloc_and_zero(hash->n * hash->size); hash->values = xmalloc_and_zero(hash->n * sizeof *hash->values); return hash; } @@ -100,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); + } } diff --git a/src/netutl.c b/src/netutl.c index a71b370f..a55eaea2 100644 --- a/src/netutl.c +++ b/src/netutl.c @@ -52,7 +52,7 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock sockaddr_t str2sockaddr(const char *address, const char *port) { struct addrinfo *ai, hint = {0}; - sockaddr_t result; + sockaddr_t result = {{0}}; int err; hint.ai_family = AF_UNSPEC; -- 2.20.1