From: Florian Forster <octo@collectd.org>
Date: Sat, 5 Dec 2015 22:08:22 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~520
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=090e054043f6d93b374dee20d766c4f906acd43a;p=collectd.git

Merge branch 'collectd-5.5'
---

090e054043f6d93b374dee20d766c4f906acd43a
diff --cc src/daemon/common.c
index dfaa61aa,fba51ef8..dd4f9b15
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@@ -1169,10 -1170,12 +1169,13 @@@ int parse_values (char *buffer, value_l
  	char *ptr;
  	char *saveptr;
  
+ 	if ((buffer == NULL) || (vl == NULL) || (ds == NULL))
+ 		return EINVAL;
+ 
 -	i = -1;
 +	i = 0;
  	dummy = buffer;
  	saveptr = NULL;
 +	vl->time = 0;
  	while ((ptr = strtok_r (dummy, ":", &saveptr)) != NULL)
  	{
  		dummy = NULL;