X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcsv.c;h=5268237e33e566c9878fde98e989345e55eff3a7;hb=e61246f70a8e81b034db36f2dd20ea0086198808;hp=afb4f8338c5d7e2611e489338eda5a642f3c56b8;hpb=bc389fa32a48a64306f7ec008f4548f05fdb7c80;p=collectd.git

diff --git a/src/csv.c b/src/csv.c
index afb4f833..5268237e 100644
--- a/src/csv.c
+++ b/src/csv.c
@@ -65,13 +65,16 @@ static int value_list_to_string (char *buffer, int buffer_len,
 				&& (ds->ds[i].type != DS_TYPE_GAUGE)
 				&& (ds->ds[i].type != DS_TYPE_DERIVE)
 				&& (ds->ds[i].type != DS_TYPE_ABSOLUTE))
+		{
+			sfree (rates);
 			return (-1);
+		}
 
-		if (ds->ds[i].type == DS_TYPE_GAUGE) 
+		if (ds->ds[i].type == DS_TYPE_GAUGE)
 		{
 			status = ssnprintf (buffer + offset, buffer_len - offset,
 					",%lf", vl->values[i].gauge);
-		} 
+		}
 		else if (store_rates != 0)
 		{
 			if (rates == NULL)
@@ -126,12 +129,25 @@ static int value_list_to_filename (char *buffer, size_t buffer_size,
 {
 	int status;
 
-	char *ptr;
-	size_t ptr_size;
+	char *ptr = buffer;
+	size_t ptr_size = buffer_size;
 	time_t now;
 	struct tm struct_tm;
 
-	status = FORMAT_VL (buffer, buffer_size, vl);
+	if (datadir != NULL)
+	{
+		size_t len = strlen (datadir) + 1;
+
+		if (len >= ptr_size)
+			return (ENOBUFS);
+
+		memcpy (ptr, datadir, len);
+		ptr[len-1] = '/';
+		ptr_size -= len;
+		ptr += len;
+	}
+
+	status = FORMAT_VL (ptr, ptr_size, vl);
 	if (status != 0)
 		return (status);
 
@@ -140,8 +156,8 @@ static int value_list_to_filename (char *buffer, size_t buffer_size,
 	if (use_stdio)
 		return (0);
 
-	ptr_size = buffer_size - strlen (buffer);
-	ptr = buffer + strlen (buffer);
+	ptr_size -= strlen (ptr);
+	ptr +=  strlen (ptr);
 
 	/* "-2013-07-12" => 11 bytes */
 	if (ptr_size < 12)
@@ -202,7 +218,10 @@ static int csv_config (const char *key, const char *value)
 	if (strcasecmp ("DataDir", key) == 0)
 	{
 		if (datadir != NULL)
+		{
 			free (datadir);
+			datadir = NULL;
+		}
 		if (strcasecmp ("stdout", value) == 0)
 		{
 			use_stdio = 1;