X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrdtool.c;h=fd5fb56334346e406b7a1747b5e41ab2459f7722;hb=b76f88c5bafa82e3c939eb65c13acd431e07cc01;hp=9b04d10ef753a8cf4818587dda4be1ebc340ad59;hpb=d89829d22853ee0b7678b6e2ee7fdd359f3b7202;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 9b04d10e..fd5fb563 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);
 
@@ -1018,11 +1018,11 @@ static int rrd_config (const char *key, const char *value)
 			return (1);
 		}
 
-		len = strlen (datadir);
-		while ((len > 0) && (datadir[len - 1] == '/'))
+		len = strlen (tmp);
+		while ((len > 0) && (tmp[len - 1] == '/'))
 		{
 			len--;
-			datadir[len] = 0;
+			tmp[len] = 0;
 		}
 
 		if (len == 0)
@@ -1032,7 +1032,11 @@ static int rrd_config (const char *key, const char *value)
 			return (1);
 		}
 
-		sfree (datadir);
+		if (datadir != NULL)
+		{
+			sfree (datadir);
+		}
+
 		datadir = tmp;
 	}
 	else if (strcasecmp ("StepSize", key) == 0)