X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_llist.c;h=1a6188f612344fedb41157f035b7159af5528df0;hb=50345eec33951b964e2829e83c30399b71f2baba;hp=09c9834d066cf6280ed993515adb36adc2176141;hpb=216c6246b73645ac093de15b87aedc9abc6ebc80;p=collectd.git

diff --git a/src/daemon/utils_llist.c b/src/daemon/utils_llist.c
index 09c9834d..1a6188f6 100644
--- a/src/daemon/utils_llist.c
+++ b/src/daemon/utils_llist.c
@@ -48,12 +48,10 @@ llist_t *llist_create (void)
 {
 	llist_t *ret;
 
-	ret = (llist_t *) malloc (sizeof (llist_t));
+	ret = calloc (1, sizeof (*ret));
 	if (ret == NULL)
 		return (NULL);
 
-	memset (ret, '\0', sizeof (llist_t));
-
 	return (ret);
 }
 
@@ -78,7 +76,7 @@ llentry_t *llentry_create (char *key, void *value)
 {
 	llentry_t *e;
 
-	e = (llentry_t *) malloc (sizeof (llentry_t));
+	e = malloc (sizeof (*e));
 	if (e)
 	{
 		e->key   = key;
@@ -123,6 +121,9 @@ void llist_remove (llist_t *l, llentry_t *e)
 {
 	llentry_t *prev;
 
+	if ((l == NULL) || (e == NULL))
+		return;
+
 	prev = l->head;
 	while ((prev != NULL) && (prev->next != e))
 		prev = prev->next;