[GNUnet-SVN] r11837 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-06-20 17:13:57 +0200 (Sun, 20 Jun 2010)
New Revision: 11837

Modified:
   gnunet/src/util/connection.c
   gnunet/src/util/network.c
Log:
fix

Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c        2010-06-20 15:10:17 UTC (rev 11836)
+++ gnunet/src/util/connection.c        2010-06-20 15:13:57 UTC (rev 11837)
@@ -354,7 +354,7 @@
                                       size_t maxbuf)
 {
   struct GNUNET_CONNECTION_Handle *ret;
-  char addr[32];
+  char addr[128];
   socklen_t addrlen;
   struct GNUNET_NETWORK_Handle *sock;
   int aret;
@@ -371,7 +371,8 @@
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "accept");
       return NULL;
     }
-  if (addrlen > sizeof (addr))
+  if ( (addrlen > sizeof (addr)) ||
+       (addrlen < sizeof (sa_family_t)) )
     {
       GNUNET_break (0);
       GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));

Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c   2010-06-20 15:10:17 UTC (rev 11836)
+++ gnunet/src/util/network.c   2010-06-20 15:13:57 UTC (rev 11837)
@@ -189,6 +189,7 @@
                               socklen_t * address_len)
 {
   struct GNUNET_NETWORK_Handle *ret;
+
   ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
   ret->fd = accept (desc->fd, address, address_len);
   if (ret->fd == INVALID_SOCKET)