projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
src
/
daemon
/
types_list.c
diff --git
a/src/daemon/types_list.c
b/src/daemon/types_list.c
index
c0e61c5
..
cf28c2e
100644
(file)
--- a/
src/daemon/types_list.c
+++ b/
src/daemon/types_list.c
@@
-101,7
+101,7
@@
static void parse_line (char *buf)
char *fields[64];
size_t fields_num;
data_set_t *ds;
char *fields[64];
size_t fields_num;
data_set_t *ds;
-
in
t i;
+
size_
t i;
fields_num = strsplit (buf, fields, 64);
if (fields_num < 2)
fields_num = strsplit (buf, fields, 64);
if (fields_num < 2)
@@
-122,14
+122,18
@@
static void parse_line (char *buf)
ds->ds_num = fields_num - 1;
ds->ds = (data_source_t *) calloc (ds->ds_num, sizeof (data_source_t));
if (ds->ds == NULL)
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;
return;
+ }
for (i = 0; i < ds->ds_num; i++)
if (parse_ds (ds->ds + i, fields[i + 1], strlen (fields[i + 1])) != 0)
{
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);
"of data set %s", i, ds->type);
+ sfree (ds->ds);
+ sfree (ds);
return;
}
return;
}