X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrdtool.c;h=4a3c345ef3ae34f198f8ce89f5b4806e2fe51b95;hb=70ea9457f76d6cd953f2cbd64eeda0ff265f47db;hp=9b5723ad2992c4d3cdcaa448c9462afead768866;hpb=4c30f47794046ec7c8dfb5e1d41d03633032bac7;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 9b5723ad..4a3c345e 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -204,7 +204,7 @@ static int value_list_to_string_multiple (char *buffer, int buffer_len,
 	int offset;
 	int status;
 	time_t tt;
-	int i;
+	size_t i;
 
 	memset (buffer, '\0', buffer_len);
 
@@ -1008,23 +1008,32 @@ static int rrd_config (const char *key, const char *value)
 	}
 	else if (strcasecmp ("DataDir", key) == 0)
 	{
-		if (datadir != NULL)
-			free (datadir);
-		datadir = strdup (value);
-		if (datadir != NULL)
+		char *tmp;
+		size_t len;
+
+		tmp = strdup (value);
+		if (tmp == NULL)
 		{
-			int len = strlen (datadir);
-			while ((len > 0) && (datadir[len - 1] == '/'))
-			{
-				len--;
-				datadir[len] = '\0';
-			}
-			if (len <= 0)
-			{
-				free (datadir);
-				datadir = NULL;
-			}
+			ERROR ("rrdtool plugin: strdup failed.");
+			return (1);
 		}
+
+		len = strlen (datadir);
+		while ((len > 0) && (datadir[len - 1] == '/'))
+		{
+			len--;
+			datadir[len] = 0;
+		}
+
+		if (len == 0)
+		{
+			ERROR ("rrdtool plugin: Invalid \"DataDir\" option.");
+			sfree (tmp);
+			return (1);
+		}
+
+		sfree (datadir);
+		datadir = tmp;
 	}
 	else if (strcasecmp ("StepSize", key) == 0)
 	{