X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdaemon%2Ftypes_list.c;h=436df6744445f96c616d22bca05b8d3ae2a638cd;hb=4103105fb43cd72294f165b2541540b3a8a99532;hp=c0e61c54b0e9e52168c85b31c9cd7bd9b422efde;hpb=6d13532642c934667697842e4ff021e070ddf34d;p=collectd.git

diff --git a/src/daemon/types_list.c b/src/daemon/types_list.c
index c0e61c54..436df674 100644
--- a/src/daemon/types_list.c
+++ b/src/daemon/types_list.c
@@ -25,10 +25,12 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 
 #include "plugin.h"
 #include "configfile.h"
+#include "types_list.h"
 
 static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
 {
@@ -101,7 +103,7 @@ static void parse_line (char *buf)
   char  *fields[64];
   size_t fields_num;
   data_set_t *ds;
-  int i;
+  size_t i;
 
   fields_num = strsplit (buf, fields, 64);
   if (fields_num < 2)
@@ -111,25 +113,27 @@ static void parse_line (char *buf)
   if (fields[0][0] == '#')
     return;
 
-  ds = (data_set_t *) malloc (sizeof (data_set_t));
+  ds = calloc (1, sizeof (*ds));
   if (ds == NULL)
     return;
 
-  memset (ds, '\0', sizeof (data_set_t));
-
   sstrncpy (ds->type, fields[0], sizeof (ds->type));
 
   ds->ds_num = fields_num - 1;
   ds->ds = (data_source_t *) calloc (ds->ds_num, sizeof (data_source_t));
   if (ds->ds == NULL)
+  {
+    sfree (ds);
     return;
+  }
 
   for (i = 0; i < ds->ds_num; i++)
     if (parse_ds (ds->ds + i, fields[i + 1], strlen (fields[i + 1])) != 0)
     {
-      sfree (ds->ds);
-      ERROR ("types_list: parse_line: Cannot parse data source #%i "
+      ERROR ("types_list: parse_line: Cannot parse data source #%zu "
 	  "of data set %s", i, ds->type);
+      sfree (ds->ds);
+      sfree (ds);
       return;
     }