From 1f019ceea1ed39286e6bccfb3ff936c22fe0f7c0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 21 Jun 2016 17:19:10 +0200 Subject: Fix various memory management issues Consistently handle allocation failures. Some functions are changed to return bool or int instead of void to allow returning an error. Also fix a buffer size miscalculation in lua/uloop and use _exit() instead of exit() on errors after forking. Signed-off-by: Matthias Schiffer --- kvlist.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'kvlist.c') diff --git a/kvlist.c b/kvlist.c index e0a8acb..a7b6ea0 100644 --- a/kvlist.c +++ b/kvlist.c @@ -71,20 +71,25 @@ bool kvlist_delete(struct kvlist *kv, const char *name) return !!node; } -void kvlist_set(struct kvlist *kv, const char *name, const void *data) +bool kvlist_set(struct kvlist *kv, const char *name, const void *data) { struct kvlist_node *node; char *name_buf; int len = kv->get_len(kv, data); - kvlist_delete(kv, name); - node = calloc_a(sizeof(struct kvlist_node) + len, &name_buf, strlen(name) + 1); + if (!node) + return false; + + kvlist_delete(kv, name); + memcpy(node->data, data, len); node->avl.key = strcpy(name_buf, name); avl_insert(&kv->avl, &node->avl); + + return true; } void kvlist_free(struct kvlist *kv) -- cgit v1.2.3