X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Frrdtool.c;h=fd5fb56334346e406b7a1747b5e41ab2459f7722;hb=5c2993e4121feae745551be182221b31bc23ff97;hp=4a3c345ef3ae34f198f8ce89f5b4806e2fe51b95;hpb=749b03b3fc459895b7415c7c13753066bf0af55b;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 4a3c345e..fd5fb563 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)