X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrdtool.c;h=7cfdae60302f5e26968288c50ec7572d455d3687;hb=5d5e6749dde4cccc5616df8536775d0f237df5e9;hp=9b04d10ef753a8cf4818587dda4be1ebc340ad59;hpb=10f0577fddc1b8583f4eb0bb96efb3439140902f;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 9b04d10e..7cfdae60 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -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)