X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cmd_putval.c;h=009ab3dc07812ef4a3472445195f762522eee91d;hb=edd9af8a874ebc9f2a7f02846807229a648917db;hp=c717f0b3c8476c1555b05f9b601eb66712804cfb;hpb=d6491cfcf52a74498e1becd7ef94fc8e0a5938b9;p=collectd.git

diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c
index c717f0b3..009ab3dc 100644
--- a/src/utils_cmd_putval.c
+++ b/src/utils_cmd_putval.c
@@ -29,6 +29,7 @@
 #include "plugin.h"
 
 #include "utils_parse_option.h"
+#include "utils_cmd_putval.h"
 
 #define print_to_socket(fh, ...) \
     do { \
@@ -36,27 +37,12 @@
             char errbuf[1024]; \
             WARNING ("handle_putval: failed to write to socket #%i: %s", \
                     fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
+            sfree (vl.values); \
             return -1; \
         } \
         fflush(fh); \
     } while (0)
 
-static int dispatch_values (const data_set_t *ds, value_list_t *vl,
-	       	FILE *fh, char *buffer)
-{
-	int status;
-
-	status = parse_values (buffer, vl, ds);
-	if (status != 0)
-	{
-		print_to_socket (fh, "-1 Parsing the values string failed.\n");
-		return (-1);
-	}
-
-	plugin_dispatch_values (vl);
-	return (0);
-} /* int dispatch_values */
-
 static int set_option (value_list_t *vl, const char *key, const char *value)
 {
 	if ((vl == NULL) || (key == NULL) || (value == NULL))
@@ -97,6 +83,7 @@ int handle_putval (FILE *fh, char *buffer)
 
 	const data_set_t *ds;
 	value_list_t vl = VALUE_LIST_INIT;
+	vl.values = NULL;
 
 	DEBUG ("utils_cmd_putval: handle_putval (fh = %p, buffer = %s);",
 			(void *) fh, buffer);
@@ -176,7 +163,7 @@ int handle_putval (FILE *fh, char *buffer)
 	sfree (identifier_copy);
 
 	vl.values_len = ds->ds_num;
-	vl.values = (value_t *) malloc (vl.values_len * sizeof (value_t));
+	vl.values = malloc (vl.values_len * sizeof (*vl.values));
 	if (vl.values == NULL)
 	{
 		print_to_socket (fh, "-1 malloc failed.\n");
@@ -196,6 +183,7 @@ int handle_putval (FILE *fh, char *buffer)
 			/* parse_option failed, buffer has been modified.
 			 * => we need to abort */
 			print_to_socket (fh, "-1 Misformatted option.\n");
+			sfree (vl.values);
 			return (-1);
 		}
 		else if (status == 0)
@@ -212,26 +200,30 @@ int handle_putval (FILE *fh, char *buffer)
 		if (status != 0)
 		{
 			print_to_socket (fh, "-1 Misformatted value.\n");
+			sfree (vl.values);
 			return (-1);
 		}
 		assert (string != NULL);
 
-		status = dispatch_values (ds, &vl, fh, string);
+		status = parse_values (string, &vl, ds);
 		if (status != 0)
 		{
-			/* An error has already been printed. */
+			print_to_socket (fh, "-1 Parsing the values string failed.\n");
+			sfree (vl.values);
 			return (-1);
 		}
+
+		plugin_dispatch_values (&vl);
 		values_submitted++;
 	} /* while (*buffer != 0) */
 	/* Done parsing the options. */
 
-	print_to_socket (fh, "0 Success: %i %s been dispatched.\n",
+    if (fh!=stdout)
+	    print_to_socket (fh, "0 Success: %i %s been dispatched.\n",
 			values_submitted,
 			(values_submitted == 1) ? "value has" : "values have");
 
-	sfree (vl.values); 
-
+	sfree (vl.values);
 	return (0);
 } /* int handle_putval */