From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 25 Jun 2006 08:48:42 +0000 (+0200)
Subject: Merge branch 'v390-fix' into v391-fix
X-Git-Tag: collectd-3.9.1~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=cc6361ca685d5cfed843e66b82ca0414b0217918;p=collectd.git

Merge branch 'v390-fix' into v391-fix
---

cc6361ca685d5cfed843e66b82ca0414b0217918
diff --cc src/liboping/liboping.c
index a85de2e3,43d5fd50..7c094e94
--- a/src/liboping/liboping.c
+++ b/src/liboping/liboping.c
@@@ -720,12 -720,9 +720,13 @@@ pingobj_t *ping_construct (void
  
  	if ((obj = (pingobj_t *) malloc (sizeof (pingobj_t))) == NULL)
  		return (NULL);
- 	memset (obj, '\0', sizeof (pingobj_t));
+ 
+ 	obj->head = NULL;
  
 +	obj->timeout    = PING_DEF_TIMEOUT;
 +	obj->ttl        = PING_DEF_TTL;
 +	obj->addrfamily = PING_DEF_AF;
 +
  	return (obj);
  }