projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
curl_xml: fix 3 small memory leaks
[collectd.git]
/
src
/
configfile.c
diff --git
a/src/configfile.c
b/src/configfile.c
index
787ad0e
..
983d995
100644
(file)
--- a/
src/configfile.c
+++ b/
src/configfile.c
@@
-414,6
+414,12
@@
static int cf_ci_replace_child (oconfig_item_t *dst, oconfig_item_t *src,
/* Resize the memory containing the children to be big enough to hold
* all children. */
/* Resize the memory containing the children to be big enough to hold
* all children. */
+ if (dst->children_num + src->children_num - 1 == 0)
+ {
+ dst->children_num = 0;
+ return (0);
+ }
+
temp = (oconfig_item_t *) realloc (dst->children,
sizeof (oconfig_item_t)
* (dst->children_num + src->children_num - 1));
temp = (oconfig_item_t *) realloc (dst->children,
sizeof (oconfig_item_t)
* (dst->children_num + src->children_num - 1));
@@
-514,7
+520,8
@@
static int cf_include_all (oconfig_item_t *root, int depth)
continue;
/* Now replace the i'th child in `root' with `new'. */
continue;
/* Now replace the i'th child in `root' with `new'. */
- cf_ci_replace_child (root, new, i);
+ if (cf_ci_replace_child (root, new, i) < 0)
+ return (-1);
/* ... and go back to the new i'th child. */
--i;
/* ... and go back to the new i'th child. */
--i;
@@
-701,11
+708,10
@@
static oconfig_item_t *cf_read_generic (const char *path, int depth)
if (status != 0)
{
char errbuf[1024];
if (status != 0)
{
char errbuf[1024];
-
ERROR
("configfile: stat (%s) failed: %s",
+
WARNING
("configfile: stat (%s) failed: %s",
path_ptr,
sstrerror (errno, errbuf, sizeof (errbuf)));
path_ptr,
sstrerror (errno, errbuf, sizeof (errbuf)));
- oconfig_free (root);
- return (NULL);
+ continue;
}
if (S_ISREG (statbuf.st_mode))
}
if (S_ISREG (statbuf.st_mode))
@@
-714,7
+720,7
@@
static oconfig_item_t *cf_read_generic (const char *path, int depth)
temp = cf_read_dir (path_ptr, depth);
else
{
temp = cf_read_dir (path_ptr, depth);
else
{
-
ERROR
("configfile: %s is neither a file nor a "
+
WARNING
("configfile: %s is neither a file nor a "
"directory.", path);
continue;
}
"directory.", path);
continue;
}
@@
-731,6
+737,12
@@
static oconfig_item_t *cf_read_generic (const char *path, int depth)
wordfree (&we);
wordfree (&we);
+ if (root->children == NULL)
+ {
+ oconfig_free (root);
+ return (NULL);
+ }
+
return (root);
} /* oconfig_item_t *cf_read_generic */
/* #endif HAVE_WORDEXP_H */
return (root);
} /* oconfig_item_t *cf_read_generic */
/* #endif HAVE_WORDEXP_H */