X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Fconfigfile.c;h=16e07247b3cf56d07937d677c1eddf861c5c2655;hb=f14825411d74f8e01d68e3c22cfd541e0cad3aa5;hp=ae3e79899d2eddf1304bcc00ba178289b3602d02;hpb=add25ce6f3129cb7138e96e5f55d11de1e5cf6de;p=collectd.git

diff --git a/src/daemon/configfile.c b/src/daemon/configfile.c
index ae3e7989..16e07247 100644
--- a/src/daemon/configfile.c
+++ b/src/daemon/configfile.c
@@ -716,6 +716,7 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 	if (root == NULL)
 	{
 		ERROR ("configfile: malloc failed.");
+		closedir (dh);
 		return (NULL);
 	}
 	memset (root, 0, sizeof (oconfig_item_t));
@@ -735,6 +736,7 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 			ERROR ("configfile: Not including `%s/%s' because its"
 					" name is too long.",
 					dir, de->d_name);
+			closedir (dh);
 			for (i = 0; i < filenames_num; ++i)
 				free (filenames[i]);
 			free (filenames);
@@ -747,6 +749,7 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 				filenames_num * sizeof (*filenames));
 		if (tmp == NULL) {
 			ERROR ("configfile: realloc failed.");
+			closedir (dh);
 			for (i = 0; i < filenames_num - 1; ++i)
 				free (filenames[i]);
 			free (filenames);
@@ -759,7 +762,10 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 	}
 
 	if (filenames == NULL)
+	{
+		closedir (dh);
 		return (root);
+	}
 
 	qsort ((void *) filenames, filenames_num, sizeof (*filenames),
 			cf_compare_string);
@@ -784,11 +790,12 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 		free (name);
 	}
 
+	closedir (dh);
 	free(filenames);
 	return (root);
 } /* oconfig_item_t *cf_read_dir */
 
-/* 
+/*
  * cf_read_generic
  *
  * Path is stat'ed and either cf_read_file or cf_read_dir is called