X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Frrdtool.c;h=6b44f67e48e36757cdd34f4dd8334873fb109aac;hb=d13a04dc3645a21acecc14a4174837766ecb6a2b;hp=4a3c345ef3ae34f198f8ce89f5b4806e2fe51b95;hpb=0d9a0eb065fda6f89fc597e760ae56edd47337d9;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 4a3c345e..6b44f67e 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -166,7 +166,7 @@ static int srrd_update (char *filename, char *template,
 	assert (template == NULL);
 
 	new_argc = 2 + argc;
-	new_argv = (char **) malloc ((new_argc + 1) * sizeof (char *));
+	new_argv = malloc ((new_argc + 1) * sizeof (*new_argv));
 	if (new_argv == NULL)
 	{
 		ERROR ("rrdtool plugin: malloc failed.");
@@ -480,7 +480,7 @@ static int rrd_queue_enqueue (const char *filename,
 {
   rrd_queue_t *queue_entry;
 
-  queue_entry = (rrd_queue_t *) malloc (sizeof (rrd_queue_t));
+  queue_entry = malloc (sizeof (*queue_entry));
   if (queue_entry == NULL)
     return (-1);
 
@@ -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)