X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fvarnish.c;h=d7da95a35b629a4207597327c6d45f9114221f61;hb=12f249b209d7fa31e3a9d53315e47a2342463e0f;hp=95303bec9bb328c1e8b8c84e3437dd286472d047;hpb=8dfaf98cde62e42d4c245400c68ae9c825a2fe68;p=collectd.git

diff --git a/src/varnish.c b/src/varnish.c
index 95303bec..d7da95a3 100644
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -943,10 +943,9 @@ static int varnish_init (void) /* {{{ */
 	if (have_instance)
 		return (0);
 
-	conf = malloc (sizeof (*conf));
+	conf = calloc (1, sizeof (*conf));
 	if (conf == NULL)
 		return (ENOMEM);
-	memset (conf, 0, sizeof (*conf));
 
 	/* Default settings: */
 	conf->instance = NULL;
@@ -972,10 +971,9 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
 	char callback_name[DATA_MAX_NAME_LEN];
 	int i;
 
-	conf = malloc (sizeof (*conf));
+	conf = calloc (1, sizeof (*conf));
 	if (conf == NULL)
 		return (ENOMEM);
-	memset (conf, 0, sizeof (*conf));
 	conf->instance = NULL;
 
 	varnish_config_apply_default (conf);
@@ -1002,6 +1000,7 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
 	{
 		WARNING ("Varnish plugin: \"Instance\" blocks accept only "
 				"one argument.");
+		sfree (conf);
 		return (EINVAL);
 	}
 
@@ -1109,6 +1108,7 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
 		WARNING ("Varnish plugin: No metric has been configured for "
 				"instance \"%s\". Disabling this instance.",
 				(conf->instance == NULL) ? "localhost" : conf->instance);
+		sfree (conf);
 		return (EINVAL);
 	}