From 65ca93d490a3dc028e42e6f1d76c2391d6e680be Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Fri, 19 Jun 2015 10:54:02 +0200 Subject: [PATCH] src/utils_cmd_putval.c: Fix memory leak. --- src/utils_cmd_putval.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c index 6a3c9e4e..c9bf48bb 100644 --- a/src/utils_cmd_putval.c +++ b/src/utils_cmd_putval.c @@ -31,27 +31,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)) @@ -92,6 +77,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); @@ -191,6 +177,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) @@ -207,16 +194,20 @@ 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. */ @@ -225,8 +216,7 @@ int handle_putval (FILE *fh, char *buffer) values_submitted, (values_submitted == 1) ? "value has" : "values have"); - sfree (vl.values); - + sfree (vl.values); return (0); } /* int handle_putval */ -- 2.30.2