From dea77dd862e71cffb2ebab5079df20e0ebaeddf5 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 21 Jan 2020 02:27:44 +0100 Subject: Fix hash map invalid alloc and free on deinit --- src/std/hash_map.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/std/hash_map.c b/src/std/hash_map.c index 1270514..80fd059 100644 --- a/src/std/hash_map.c +++ b/src/std/hash_map.c @@ -4,16 +4,6 @@ #include #include -void tsl_hash_map_init(TslHashMap *self) { - self->buckets_data = NULL; - self->buckets_size = 0; - self->buckets_capacity = 0; -} - -void tsl_hash_map_deinit(TslHashMap *self) { - free(self->buckets_data); -} - typedef struct TslHashMapNode TslHashMapNode; struct TslHashMapNode { void *data; @@ -33,9 +23,31 @@ static void hash_map_node_get(TslHashMapNode *self, uint64_t *hash, TslStringVie *data = (uint8_t*)self->data + sizeof(uint64_t) + sizeof(key->size) + key->size + sizeof(size_t); } +void tsl_hash_map_init(TslHashMap *self) { + self->buckets_data = NULL; + self->buckets_size = 0; + self->buckets_capacity = 0; +} + +void tsl_hash_map_deinit(TslHashMap *self) { + TslHashMapNode **bucket = (TslHashMapNode**)self->buckets_data; + TslHashMapNode **bucket_end = (TslHashMapNode**)((char*)self->buckets_data + self->buckets_capacity); + while(bucket != bucket_end) { + TslHashMapNode *node = *bucket; + while(node) { + TslHashMapNode *prev_node = node; + node = node->next; + free(prev_node->data); + free(prev_node); + } + ++bucket; + } + free(self->buckets_data); +} + static int tsl_hash_map_append_bucket(TslHashMapNode **head_node, uint64_t hash, const TslStringView *key, size_t size, const void *data) { TslHashMapNode *next_node; - uint8_t *node_data = malloc(sizeof(hash) + sizeof(size) + size); + uint8_t *node_data = malloc(sizeof(hash) + sizeof(key->size) + key->size + sizeof(size) + size); if(!node_data) { fprintf(stderr, "Error: hash map append failed. Reason: out of memory\n"); return 0; -- cgit v1.2.3