X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdaemon%2Fcommon.c;h=2f6da95772beb5dc8f976d0ce2c79796e1bf87a5;hb=1ebf2f31bd2e080e6f42de640f0a3899a61501c0;hp=dfaa61aa24fc4e49c6617497981b7f108819ef49;hpb=4b8c1289003f0d60728f06a43bfcc9bc3de7004c;p=collectd.git

diff --git a/src/daemon/common.c b/src/daemon/common.c
index dfaa61aa..2f6da957 100644
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -144,7 +144,7 @@ char *sstrdup (const char *s)
 	/* Do not use `strdup' here, because it's not specified in POSIX. It's
 	 * ``only'' an XSI extension. */
 	sz = strlen (s) + 1;
-	r = (char *) malloc (sizeof (char) * sz);
+	r = malloc (sz);
 	if (r == NULL)
 	{
 		ERROR ("sstrdup: Out of memory.");
@@ -409,7 +409,7 @@ int escape_string (char *buffer, size_t buffer_size)
   if (buffer_size < 3)
     return (EINVAL);
 
-  temp = (char *) malloc (buffer_size);
+  temp = malloc (buffer_size);
   if (temp == NULL)
     return (ENOMEM);
   memset (temp, 0, buffer_size);
@@ -1169,6 +1169,9 @@ int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds)
 	char *ptr;
 	char *saveptr;
 
+	if ((buffer == NULL) || (vl == NULL) || (ds == NULL))
+		return EINVAL;
+
 	i = 0;
 	dummy = buffer;
 	saveptr = NULL;