author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200) |
src/ntpd.c | patch | blob | history | |
src/rrdtool.c | patch | blob | history |
diff --git a/src/ntpd.c b/src/ntpd.c
index 64e1bce5e03db170accdf18f1a004f94c16652d4..f51ef5aee72aad3f2c8fd8ba88a4ba2bc4ddda24 100644 (file)
--- a/src/ntpd.c
+++ b/src/ntpd.c
if (ptr->v6_flag)
{
- struct sockaddr_in6 *sa_ptr;
- sa_ptr = (struct sockaddr_in6 *) &sa;
+ struct sockaddr_in6 sa6;
- sa_ptr->sin6_family = AF_INET6;
- sa_ptr->sin6_port = htons (123);
- memcpy (&sa_ptr->sin6_addr, &ptr->srcadr6,
+ assert (sizeof (sa) >= sizeof (sa6));
+
+ memset (&sa6, 0, sizeof (sa6));
+ sa6.sin6_family = AF_INET6;
+ sa6.sin6_port = htons (123);
+ memcpy (&sa6.sin6_addr, &ptr->srcadr6,
sizeof (struct in6_addr));
- sa_len = sizeof (struct sockaddr_in6);
+ sa_len = sizeof (sa6);
+
+ memcpy (&sa, &sa6, sizeof (sa6));
}
else
{
- struct sockaddr_in *sa_ptr;
- sa_ptr = (struct sockaddr_in *) &sa;
+ struct sockaddr_in sa4;
- sa_ptr->sin_family = AF_INET;
- sa_ptr->sin_port = htons (123);
- memcpy (&sa_ptr->sin_addr, &ptr->srcadr,
+ assert (sizeof (sa) >= sizeof (sa4));
+
+ memset (&sa4, 0, sizeof (sa4));
+ sa4.sin_family = AF_INET;
+ sa4.sin_port = htons (123);
+ memcpy (&sa4.sin_addr, &ptr->srcadr,
sizeof (struct in_addr));
- sa_len = sizeof (struct sockaddr_in);
+ sa_len = sizeof (sa4);
+
+ memcpy (&sa, &sa4, sizeof (sa4));
}
if (do_reverse_lookups == 0)
diff --git a/src/rrdtool.c b/src/rrdtool.c
index b80e1109cfcdfed8e27623a3390e548e0ca9e7e5..bbebc375ffd1899a3d2b727817ade097e60d093a 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
int status;
int i;
+ values = NULL;
+ values_num = 0;
+
pthread_mutex_lock (&queue_lock);
/* Wait for values to arrive */
while (true)