X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdaemon%2Fconfigfile.c;h=ae9ab3a6cfe6bd6679fbc3dadc5ffa5a124fc25f;hb=06efe4f50bbdfbade922b8a3ee4576eb2cc4562c;hp=f34adae319a63928e8346be26e28b0a4dbe8f6ca;hpb=3489284330462f4edc85a75445a5cc8014e29db0;p=collectd.git

diff --git a/src/daemon/configfile.c b/src/daemon/configfile.c
index f34adae3..ae9ab3a6 100644
--- a/src/daemon/configfile.c
+++ b/src/daemon/configfile.c
@@ -156,9 +156,12 @@ static int cf_dispatch (const char *type, const char *orig_key,
 	int ret;
 	int i;
 
+	if (orig_key == NULL)
+		return (EINVAL);
+
 	DEBUG ("type = %s, key = %s, value = %s",
 			ESCAPE_NULL(type),
-			ESCAPE_NULL(orig_key),
+			orig_key,
 			ESCAPE_NULL(orig_value));
 
 	if ((cf_cb = cf_search (type)) == NULL)
@@ -199,8 +202,6 @@ static int cf_dispatch (const char *type, const char *orig_key,
 	free (key);
 	free (value);
 
-	DEBUG ("cf_dispatch: return (%i)", ret);
-
 	return (ret);
 } /* int cf_dispatch */
 
@@ -627,8 +628,11 @@ static int cf_include_all (oconfig_item_t *root, int depth)
 			return (-1);
 
 		/* Now replace the i'th child in `root' with `new'. */
-		if (cf_ci_replace_child (root, new, i) < 0)
+		if (cf_ci_replace_child (root, new, i) < 0) {
+			sfree (new->values);
+			sfree (new);
 			return (-1);
+		}
 
 		/* ... and go back to the new i'th child. */
 		--i;
@@ -759,6 +763,9 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 		filenames[filenames_num - 1] = sstrdup (name);
 	}
 
+	if (filenames == NULL)
+		return (root);
+
 	qsort ((void *) filenames, filenames_num, sizeof (*filenames),
 			cf_compare_string);