Merge branch 'collectd-5.5'

diff --cc src/daemon/common.c
index dfaa61aa24fc4e49c6617497981b7f108819ef49,fba51ef8f73be8f8bbb174e55525e59e6e397eb0..dd4f9b15ae39a5036cbb0b40f0b8c21624ee473a
--- 1/src/daemon/common.c
--- 2/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;
  
 -      i = -1;
+       if ((buffer == NULL) || (vl == NULL) || (ds == NULL))
+               return EINVAL;
+ 
 +      i = 0;
        dummy = buffer;
        saveptr = NULL;
 +      vl->time = 0;
        while ((ptr = strtok_r (dummy, ":", &saveptr)) != NULL)
        {
                dummy = NULL;

diff --cc src/iptables.c
Simple merge

diff --cc src/libcollectdclient/network.c
Simple merge