[GNUnet-SVN] r19394 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-01-25 16:02:55 +0100 (Wed, 25 Jan 2012)
New Revision: 19394

Modified:
   gnunet/src/transport/plugin_transport_http.c
Log:
- clang


Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2012-01-25 14:49:22 UTC 
(rev 19393)
+++ gnunet/src/transport/plugin_transport_http.c        2012-01-25 15:02:55 UTC 
(rev 19394)
@@ -181,7 +181,7 @@
   size_t sbs;
   uint16_t port = 0;
 
-  if (addrlen == sizeof (struct IPv6HttpAddress))
+  if ((addrlen == sizeof (struct IPv6HttpAddress))  && (addr != NULL))
   {
     struct IPv6HttpAddress *a6 = (struct IPv6HttpAddress *) addr;
     s6.sin6_family = AF_INET6;
@@ -195,7 +195,7 @@
     port = ntohs (a6->u6_port);
 
   }
-  else if (addrlen == sizeof (struct IPv4HttpAddress))
+  else if ((addrlen == sizeof (struct IPv4HttpAddress))  && (addr != NULL))
   {
     struct IPv4HttpAddress *a4 = (struct IPv4HttpAddress *) addr;
 
@@ -607,7 +607,7 @@
 #endif
     int res = GNUNET_OK;
     struct GNUNET_ATS_Information ats;
-    if (addrlen == sizeof (struct IPv4HttpAddress))
+    if ((addrlen == sizeof (struct IPv4HttpAddress)) && (addr != NULL))
     {
       struct IPv4HttpAddress *a4 = (struct IPv4HttpAddress *) addr;
       struct sockaddr_in s4;
@@ -623,7 +623,7 @@
       if ((ntohs (a4->u4_port) == 0) || (plugin->ipv4 == GNUNET_NO))
         res = GNUNET_SYSERR;
     }
-    if (addrlen == sizeof (struct IPv6HttpAddress))
+    if ((addrlen == sizeof (struct IPv6HttpAddress)) && (addr != NULL))
     {
       struct IPv6HttpAddress *a6 = (struct IPv6HttpAddress *) addr;
       struct sockaddr_in6 s6;